From: wrider Date: Wed, 26 Jun 2019 20:48:20 +0000 (-0400) Subject: Move Credential to seq 40 X-Git-Tag: 0.0.2~84^2 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=e01667fb0798c859ec9eeaba88bfb13951efe5f2;p=it%2Fdep.git Move Credential to seq 40 Moved Credential to sep 40; Added Monitoring installation Change-Id: Id691a26dd20f56cd46579754031d81f4f65da528 Signed-off-by: wrider --- diff --git a/ric-infra/20-Monitoring/bin/install b/ric-infra/20-Monitoring/bin/install new file mode 100755 index 00000000..b7d0c6f1 --- /dev/null +++ b/ric-infra/20-Monitoring/bin/install @@ -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 index 00000000..dba83ea9 --- /dev/null +++ b/ric-infra/20-Monitoring/bin/uninstall @@ -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 index 00000000..e9e4100d --- /dev/null +++ b/ric-infra/20-Monitoring/etc/elfkp.conf @@ -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 index 00000000..e69de29b diff --git a/ric-infra/20-Monitoring/helm/elfkp/Chart.yaml b/ric-infra/20-Monitoring/helm/elfkp/Chart.yaml new file mode 100644 index 00000000..2b9762c0 --- /dev/null +++ b/ric-infra/20-Monitoring/helm/elfkp/Chart.yaml @@ -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 index 00000000..cc2ca5ab --- /dev/null +++ b/ric-infra/20-Monitoring/helm/elfkp/requirements.yaml @@ -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 index 00000000..eff02e78 --- /dev/null +++ b/ric-infra/20-Monitoring/helm/elfkp/values.yaml @@ -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 diff --git a/ric-infra/20-Credential/bin/install b/ric-infra/40-Credential/bin/install similarity index 100% rename from ric-infra/20-Credential/bin/install rename to ric-infra/40-Credential/bin/install diff --git a/ric-infra/20-Credential/bin/uninstall b/ric-infra/40-Credential/bin/uninstall similarity index 100% rename from ric-infra/20-Credential/bin/uninstall rename to ric-infra/40-Credential/bin/uninstall diff --git a/ric-infra/20-Credential/etc/credential.conf b/ric-infra/40-Credential/etc/credential.conf similarity index 100% rename from ric-infra/20-Credential/etc/credential.conf rename to ric-infra/40-Credential/etc/credential.conf diff --git a/ric-infra/20-Credential/helm/Chart.yaml b/ric-infra/40-Credential/helm/Chart.yaml similarity index 100% rename from ric-infra/20-Credential/helm/Chart.yaml rename to ric-infra/40-Credential/helm/Chart.yaml diff --git a/ric-infra/20-Credential/helm/requirements.yaml b/ric-infra/40-Credential/helm/requirements.yaml similarity index 100% rename from ric-infra/20-Credential/helm/requirements.yaml rename to ric-infra/40-Credential/helm/requirements.yaml diff --git a/ric-infra/20-Credential/helm/resources/tls.crt b/ric-infra/40-Credential/helm/resources/tls.crt similarity index 100% rename from ric-infra/20-Credential/helm/resources/tls.crt rename to ric-infra/40-Credential/helm/resources/tls.crt diff --git a/ric-infra/20-Credential/helm/templates/_helper.tpl b/ric-infra/40-Credential/helm/templates/_helper.tpl similarity index 100% rename from ric-infra/20-Credential/helm/templates/_helper.tpl rename to ric-infra/40-Credential/helm/templates/_helper.tpl diff --git a/ric-infra/20-Credential/helm/templates/config-helm-cert.yaml b/ric-infra/40-Credential/helm/templates/config-helm-cert.yaml similarity index 100% rename from ric-infra/20-Credential/helm/templates/config-helm-cert.yaml rename to ric-infra/40-Credential/helm/templates/config-helm-cert.yaml diff --git a/ric-infra/20-Credential/helm/templates/secrets-docker-reg.yaml b/ric-infra/40-Credential/helm/templates/secrets-docker-reg.yaml similarity index 100% rename from ric-infra/20-Credential/helm/templates/secrets-docker-reg.yaml rename to ric-infra/40-Credential/helm/templates/secrets-docker-reg.yaml diff --git a/ric-infra/20-Credential/helm/templates/secrets-helm-xapp.yaml b/ric-infra/40-Credential/helm/templates/secrets-helm-xapp.yaml similarity index 100% rename from ric-infra/20-Credential/helm/templates/secrets-helm-xapp.yaml rename to ric-infra/40-Credential/helm/templates/secrets-helm-xapp.yaml diff --git a/ric-infra/20-Credential/helm/values.yaml b/ric-infra/40-Credential/helm/values.yaml similarity index 100% rename from ric-infra/20-Credential/helm/values.yaml rename to ric-infra/40-Credential/helm/values.yaml