Merge "Move Credential to seq 40"
authorZhe Huang <zhehuang@research.att.com>
Wed, 26 Jun 2019 20:59:36 +0000 (20:59 +0000)
committerGerrit Code Review <gerrit@o-ran-sc.org>
Wed, 26 Jun 2019 20:59:36 +0000 (20:59 +0000)
18 files changed:
ric-infra/20-Monitoring/bin/install [new file with mode: 0755]
ric-infra/20-Monitoring/bin/uninstall [new file with mode: 0755]
ric-infra/20-Monitoring/etc/elfkp.conf [new file with mode: 0644]
ric-infra/20-Monitoring/helm/elfkp/.helm/repository/local/index.yaml [new file with mode: 0644]
ric-infra/20-Monitoring/helm/elfkp/Chart.yaml [new file with mode: 0644]
ric-infra/20-Monitoring/helm/elfkp/requirements.yaml [new file with mode: 0644]
ric-infra/20-Monitoring/helm/elfkp/values.yaml [new file with mode: 0644]
ric-infra/40-Credential/bin/install [moved from ric-infra/20-Credential/bin/install with 100% similarity]
ric-infra/40-Credential/bin/uninstall [moved from ric-infra/20-Credential/bin/uninstall with 100% similarity]
ric-infra/40-Credential/etc/credential.conf [moved from ric-infra/20-Credential/etc/credential.conf with 100% similarity]
ric-infra/40-Credential/helm/Chart.yaml [moved from ric-infra/20-Credential/helm/Chart.yaml with 100% similarity]
ric-infra/40-Credential/helm/requirements.yaml [moved from ric-infra/20-Credential/helm/requirements.yaml with 100% similarity]
ric-infra/40-Credential/helm/resources/tls.crt [moved from ric-infra/20-Credential/helm/resources/tls.crt with 100% similarity]
ric-infra/40-Credential/helm/templates/_helper.tpl [moved from ric-infra/20-Credential/helm/templates/_helper.tpl with 100% similarity]
ric-infra/40-Credential/helm/templates/config-helm-cert.yaml [moved from ric-infra/20-Credential/helm/templates/config-helm-cert.yaml with 100% similarity]
ric-infra/40-Credential/helm/templates/secrets-docker-reg.yaml [moved from ric-infra/20-Credential/helm/templates/secrets-docker-reg.yaml with 100% similarity]
ric-infra/40-Credential/helm/templates/secrets-helm-xapp.yaml [moved from ric-infra/20-Credential/helm/templates/secrets-helm-xapp.yaml with 100% similarity]
ric-infra/40-Credential/helm/values.yaml [moved from ric-infra/20-Credential/helm/values.yaml with 100% similarity]

diff --git a/ric-infra/20-Monitoring/bin/install b/ric-infra/20-Monitoring/bin/install
new file mode 100755 (executable)
index 0000000..b7d0c6f
--- /dev/null
@@ -0,0 +1,69 @@
+#!/bin/bash
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#   Copyright (c) 2019 Nokia.                                                  #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+
+OVERRIDEYAML=$1
+
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+source $DIR/../etc/elfkp.conf
+
+if [ -z "$RICAUX_RELEASE_NAME" ];then
+   RELEASE_NAME=$helm_release_name
+else
+   RELEASE_NAME=$RICAUX_RELEASE_NAME
+fi
+if [ -z "$RICAUX_NAMESPACE" ];then
+   NAMESPACE=$namespace
+else
+   NAMESPACE=$RICAUX_NAMESPACE
+fi
+
+#helm install --name my-release stable/elastic-stack --set elasticsearch.data.persistence.enabled=false --set elasticsearch.master.persistence.enabled=false --set logstash.persistence.enabled=false 
+
+RICAUX_COMPONENTS="elfkp"
+
+echo "Deploying RIC AUX components [$RICAUX_COMPONENTS]"
+echo "Platform Namespace: $NAMESPACE"
+echo "Helm Release Name: $RELEASE_NAME"
+
+
+for component in $RICAUX_COMPONENTS; do
+  mkdir -p $DIR/../helm/$component/charts/
+  pushd $DIR/../helm/$component/
+  helm dep update
+  popd
+
+  ELASTIC_SEARCH_HOST="${RELEASE_NAME}-${component}-elasticsearch-client.${NAMESPACE}.svc.cluster.local"
+  ELASTIC_SEARCH_PORT=9200
+  #CMD="helm install --debug \
+  #   --namespace ${NAMESPACE} --name ${RELEASE_NAME}-${component_clean} \
+  #   -f ../helm/$component/values.yaml \
+  #   --set kibana.env.ELASTICSEARCH_URL=http://${ELASTIC_SEARCH_HOST}:${ELASTIC_SEARCH_PORT} \
+  #   --set logstash.elasticsearch.host=${ELASTIC_SEARCH_HOST} \
+  #   --set logstash.elasticsearch.host=${ELASTIC_SEARCH_PORT} \
+  #   $component"
+  #eval "$CMD"
+
+  if [ -z $OVERRIDEYAML ]; then
+    helm install --debug --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-$component" $component
+  else
+    helm install -f $OVERRIDEYAML --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-$component" $component
+  fi
+done
diff --git a/ric-infra/20-Monitoring/bin/uninstall b/ric-infra/20-Monitoring/bin/uninstall
new file mode 100755 (executable)
index 0000000..dba83ea
--- /dev/null
@@ -0,0 +1,47 @@
+#!/bin/bash
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#   Copyright (c) 2019 Nokia.                                                  #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+
+
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+
+source $DIR/../etc/elfkp.conf
+
+if [ -z "$RICAUX_RELEASE_NAME" ];then
+   RELEASE_NAME=$helm_release_name
+else
+   RELEASE_NAME=$RICAUX_RELEASE_NAME
+fi
+if [ -z "$RICAUX_NAMESPACE" ];then
+   NAMESPACE=$namespace
+else
+   NAMESPACE=$RICAUX_NAMESPACE
+fi
+
+RICAUX_COMPONENTS="elfkp"
+
+echo "Undeploying RIC AUX components [$RICAUX_COMPONENTS]"
+echo "Platform Namespace: $NAMESPACE"
+echo "Helm Release Name: $RELEASE_NAME"
+
+
+for component in $RICAUX_COMPONENTS; do
+  helm delete --purge  "${RELEASE_NAME}-${component}" 
+done
diff --git a/ric-infra/20-Monitoring/etc/elfkp.conf b/ric-infra/20-Monitoring/etc/elfkp.conf
new file mode 100644 (file)
index 0000000..e9e4100
--- /dev/null
@@ -0,0 +1,25 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#   Copyright (c) 2019 Nokia.                                                  #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+
+# helm_release_name defines the release name helm will use to deploy RIC
+# It will be overrided by RICAUX_RELEASE_NAME
+helm_release_name=ttt
+
+# namespace defines the namespace that helm will use to deploy RIC
+# It will be overrided by RICAUX_NAMESPACE
+namespace=ricmon
diff --git a/ric-infra/20-Monitoring/helm/elfkp/.helm/repository/local/index.yaml b/ric-infra/20-Monitoring/helm/elfkp/.helm/repository/local/index.yaml
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/ric-infra/20-Monitoring/helm/elfkp/Chart.yaml b/ric-infra/20-Monitoring/helm/elfkp/Chart.yaml
new file mode 100644 (file)
index 0000000..2b9762c
--- /dev/null
@@ -0,0 +1,8 @@
+apiVersion: v1
+description: A Helm chart for metric and monitoring (ELFK stack and Prometheus) for RIC
+name: ric-elfkp
+version: 0.0.1
+appVersion: 0.1
+maintainers:
+- name: wrider
+  email: lji@research.att.com
diff --git a/ric-infra/20-Monitoring/helm/elfkp/requirements.yaml b/ric-infra/20-Monitoring/helm/elfkp/requirements.yaml
new file mode 100644 (file)
index 0000000..cc2ca5a
--- /dev/null
@@ -0,0 +1,9 @@
+dependencies:
+- name: elastic-stack
+  version: 1.7.0
+  repository: https://kubernetes-charts.storage.googleapis.com/
+  condition: elastic-stack.enabled
+- name: prometheus
+  version: 8.11.4
+  repository: https://kubernetes-charts.storage.googleapis.com/
+  condition: prometheus.enabled
diff --git a/ric-infra/20-Monitoring/helm/elfkp/values.yaml b/ric-infra/20-Monitoring/helm/elfkp/values.yaml
new file mode 100644 (file)
index 0000000..eff02e7
--- /dev/null
@@ -0,0 +1,103 @@
+# Default values for elk.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+prometheus:
+  enabled: true
+
+  # individual component configs
+  # full listing: https://github.com/helm/charts/tree/master/stable/prometheus
+  alertmanager:
+    enabled: true
+    persistentVolume:
+      enabled: false
+  kubeStateMetrics:
+    enabled: true
+  nodeExporter:
+    enabled: false
+  pushgateway:
+    enabled: false
+    persistentVolume:
+      enabled: false
+  server:
+    persistentVolume:
+      enabled: false
+
+
+
+elastic-stack:
+  enabled: true
+
+  # individual component configs
+  # full listing: https://github.com/helm/charts/tree/master/stable/elastic-stack
+  elasticsearch:
+    enabled: true
+    data:
+      persistence:
+        enabled: false
+    master:
+      persistence:
+        enabled: false
+
+  kibana:
+    enabled: true
+    env:
+      ELASTICSEARCH_URL: http://http.default.svc.cluster.local:9200
+
+  logstash:
+    enabled: true
+    persistence:
+      enabled: false
+    # elasticsearch:
+    #   host: elastic-stack-elasticsearch-client
+
+  filebeat:
+    enabled: false
+    # config:
+    #   output.file.enabled: false
+    #   output.logstash:
+    #     hosts: ["elastic-stack-logstash:5044"]
+    # indexTemplateLoad:
+    #   - elastic-stack-elasticsearch-client:9200
+
+  fluentd:
+    enabled: false
+
+  fluent-bit:
+    enabled: false
+
+  fluentd-elasticsearch:
+    enabled: false
+
+  nginx-ldapauth-proxy:
+    enabled: false
+    # Example config to get it working with ELK. Adjust as you need to.
+    # proxy:
+    #   port: 5601
+    #   # This is the internal hostname for the kibana service
+    #   host: "elk-kibana.default.svc.cluster.local"
+    #   authName: "ELK:Infrastructure:LDAP"
+    #   ldapHost: "ldap.example.com"
+    #   ldapDN: "dc=example,dc=com"
+    #   ldapFilter: "objectClass=organizationalPerson"
+    #   ldapBindDN: "cn=reader,dc=example,dc=com"
+    #   requires:
+    #     - name: "ELK-USER"
+    #       filter: "cn=elkuser,ou=groups,dc=example,dc=com"
+    # ingress:
+    #   enabled: true
+    #   hosts:
+    #     - "elk.example.com"
+    #   annotations:
+    #     kubernetes.io/ingress.class: nginx
+    #   tls:
+    #     - hosts:
+    #       - elk.example.com
+    #       secretName: example-elk-tls
+    # secrets:
+    #   ldapBindPassword: PASSWORD
+  elasticsearch-curator:
+    enabled: false
+
+  elasticsearch-exporter:
+    enabled: false