Adding first seba template
Change-Id: I28767f4d9aabab5dd1c6dcbe482ad4d14196a989
diff --git a/.gitreview b/.gitreview
index 27e5c19..139b22e 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,3 +3,4 @@
port=29418
project=seba.git
defaultremote=origin
+defaultbranch=master
\ No newline at end of file
diff --git a/helm-charts/README.md b/helm-charts/README.md
deleted file mode 100644
index 481eff1..0000000
--- a/helm-charts/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# SEBA Helm Charts
-
-This directory contains Helm charts used to install SEBA components on
-a Kubernetes cluster.
-
-To install SEBA:
-
-```
-helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com/
-helm repo add cord https://charts.opencord.org/master
-helm repo add cord6 https://charts.opencord.org/cord-6.0
-helm dep update nem-core
-helm dep update profile/bng-in-fabric
-helm dep update seba-substrate
-helm install nem-core -n nem-core
-helm install profile/bng-in-fabric -n nem-svc
-helm install seba-substrate -n seba-substrate
-helm upgrade seba-substrate --set voltha.etcd-operator.customResources.createEtcdClusterCRD=true seba-substrate
-```
-
-After installing the SEBA charts above, the following commands can be used to
-wait until all pods have started successfully:
-
-```
-../tools/wait-for-pods.sh
-../tools/wait-for-pods.sh voltha
-```
\ No newline at end of file
diff --git a/helm-charts/nem-core/.helmignore b/helm-charts/nem-core/.helmignore
deleted file mode 100644
index f0c1319..0000000
--- a/helm-charts/nem-core/.helmignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
diff --git a/helm-charts/nem-core/templates/NOTES.txt b/helm-charts/nem-core/templates/NOTES.txt
deleted file mode 100644
index cb50ff5..0000000
--- a/helm-charts/nem-core/templates/NOTES.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Thank you for installing {{ .Chart.Name }}.
-
-Your release is named {{ .Release.Name }}.
-
diff --git a/helm-charts/nem-core/values.yaml b/helm-charts/nem-core/values.yaml
deleted file mode 100644
index 4696c48..0000000
--- a/helm-charts/nem-core/values.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# 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.
-
-# Aggregation chart of NEM charts
-
-kafka:
- replicas: 1
- persistence:
- enabled: false
- zookeeper:
- servers: 1
- persistence:
- enabled: false
diff --git a/helm-charts/nem-monitoring/.helmignore b/helm-charts/nem-monitoring/.helmignore
deleted file mode 100644
index f0c1319..0000000
--- a/helm-charts/nem-monitoring/.helmignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
diff --git a/helm-charts/nem-monitoring/Chart.yaml b/helm-charts/nem-monitoring/Chart.yaml
deleted file mode 100644
index ff22295..0000000
--- a/helm-charts/nem-monitoring/Chart.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# 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.
-
-name: nem-monitoring
-description: Time Series Storage and Dashboard for SEBA
-version: 1.0.0-dev
-
diff --git a/helm-charts/nem-monitoring/README.md b/helm-charts/nem-monitoring/README.md
deleted file mode 100644
index 53c271c..0000000
--- a/helm-charts/nem-monitoring/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Nem Monitoring
-
-To deploy this chart please use:
-
-```shell
-helm install -n nem-monitoring nem-monitoring/
-```
-
-It will expose:
-
-- grafana on port `31000`
-- prometheus on port `31001`
-
-## Running on minikube
-
-On minikube you don't need all the permission schema, so install this chart with:
-
-```shell
-helm install -n nem-monitoring nem-monitoring/ -f nem-monitoring/examples/nem-monitoring-minikube.yaml
-```
\ No newline at end of file
diff --git a/helm-charts/nem-monitoring/examples/nem-monitoring-minikube.yaml b/helm-charts/nem-monitoring/examples/nem-monitoring-minikube.yaml
deleted file mode 100644
index a8aa763..0000000
--- a/helm-charts/nem-monitoring/examples/nem-monitoring-minikube.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-#
-# 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.
-
-prometheus:
- rbac:
- create: false
-grafana:
- rbac:
- create: false
- serviceAccount:
- create: false
\ No newline at end of file
diff --git a/helm-charts/nem-monitoring/grafana-dashboards/kb8s-app-metrics.json b/helm-charts/nem-monitoring/grafana-dashboards/kb8s-app-metrics.json
deleted file mode 100644
index 9b5d28f..0000000
--- a/helm-charts/nem-monitoring/grafana-dashboards/kb8s-app-metrics.json
+++ /dev/null
@@ -1,1400 +0,0 @@
-{
- "__inputs": [
- {
- "name": "DS_PROMETHEUS",
- "label": "prometheus",
- "description": "",
- "type": "datasource",
- "pluginId": "prometheus",
- "pluginName": "Prometheus"
- }
- ],
- "__requires": [
- {
- "type": "grafana",
- "id": "grafana",
- "name": "Grafana",
- "version": "4.1.1"
- },
- {
- "type": "panel",
- "id": "graph",
- "name": "Graph",
- "version": ""
- },
- {
- "type": "datasource",
- "id": "prometheus",
- "name": "Prometheus",
- "version": "1.0.0"
- }
- ],
- "annotations": {
- "list": []
- },
- "editable": true,
- "gnetId": 1471,
- "graphTooltip": 1,
- "hideControls": false,
- "id": null,
- "links": [],
- "refresh": "30s",
- "rows": [
- {
- "collapse": false,
- "height": "250px",
- "panels": [
- {
- "aliasColors": {},
- "bars": false,
- "datasource": "Prometheus",
- "editable": true,
- "error": false,
- "fill": 1,
- "grid": {},
- "id": 3,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "max": true,
- "min": false,
- "rightSide": true,
- "show": true,
- "sort": "avg",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "span": 6,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum(irate(http_requests_total{app=\"$container\", handler!=\"prometheus\", kubernetes_namespace=\"$namespace\"}[30s])) by (kubernetes_namespace,app,code)",
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "native | {{code}}",
- "refId": "A",
- "step": 10
- },
- {
- "expr": "sum(irate(nginx_http_requests_total{app=\"$container\", kubernetes_namespace=\"$namespace\"}[30s])) by (kubernetes_namespace,app,status)",
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "nginx | {{status}}",
- "refId": "B",
- "step": 10
- },
- {
- "expr": "sum(irate(haproxy_backend_http_responses_total{app=\"$container\", kubernetes_namespace=\"$namespace\"}[30s])) by (app,kubernetes_namespace,code)",
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "haproxy | {{code}}",
- "refId": "C",
- "step": 10
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Request rate",
- "tooltip": {
- "msResolution": true,
- "shared": false,
- "sort": 0,
- "value_type": "cumulative"
- },
- "type": "graph",
- "xaxis": {
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "ops",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ]
- },
- {
- "aliasColors": {},
- "bars": false,
- "datasource": "Prometheus",
- "fill": 1,
- "id": 15,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "max": true,
- "min": false,
- "rightSide": true,
- "show": true,
- "sort": "avg",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "span": 6,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum(irate(haproxy_backend_http_responses_total{app=\"$container\", kubernetes_namespace=\"$namespace\",code=\"5xx\"}[30s])) by (app,kubernetes_namespace) / sum(irate(haproxy_backend_http_responses_total{app=\"$container\", kubernetes_namespace=\"$namespace\"}[30s])) by (app,kubernetes_namespace)",
- "interval": "",
- "intervalFactor": 2,
- "legendFormat": "haproxy",
- "refId": "A",
- "step": 20
- },
- {
- "expr": "sum(irate(http_requests_total{app=\"$container\", handler!=\"prometheus\", kubernetes_namespace=\"$namespace\", code=~\"5[0-9]+\"}[30s])) by (kubernetes_namespace,app) / sum(irate(http_requests_total{app=\"$container\", handler!=\"prometheus\", kubernetes_namespace=\"$namespace\"}[30s])) by (kubernetes_namespace,app)",
- "intervalFactor": 2,
- "legendFormat": "native",
- "refId": "B",
- "step": 20
- },
- {
- "expr": "sum(irate(nginx_http_requests_total{app=\"$container\", kubernetes_namespace=\"$namespace\", status=~\"5[0-9]+\"}[30s])) by (kubernetes_namespace,app) / sum(irate(nginx_http_requests_total{app=\"$container\", kubernetes_namespace=\"$namespace\"}[30s])) by (kubernetes_namespace,app)",
- "intervalFactor": 2,
- "legendFormat": "nginx",
- "refId": "C",
- "step": 20
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Error rate",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "percentunit",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ]
- }
- ],
- "repeat": null,
- "repeatIteration": null,
- "repeatRowId": null,
- "showTitle": false,
- "title": "Request rate",
- "titleSize": "h6"
- },
- {
- "collapse": true,
- "height": 224,
- "panels": [
- {
- "aliasColors": {},
- "bars": false,
- "datasource": "Prometheus",
- "editable": true,
- "error": false,
- "fill": 1,
- "grid": {},
- "id": 5,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "max": true,
- "min": false,
- "rightSide": true,
- "show": true,
- "sort": "max",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "span": 12,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "histogram_quantile(0.99, sum(rate(http_request_duration_seconds_bucket{app=\"$container\", kubernetes_namespace=\"$namespace\"}[30s])) by (app,kubernetes_namespace,le))",
- "intervalFactor": 1,
- "legendFormat": "native | 0.99",
- "refId": "A",
- "step": 1
- },
- {
- "expr": "histogram_quantile(0.90, sum(rate(http_request_duration_seconds_bucket{app=\"$container\", kubernetes_namespace=\"$namespace\"}[30s])) by (app,kubernetes_namespace,le))",
- "intervalFactor": 1,
- "legendFormat": "native | 0.90",
- "refId": "B",
- "step": 1
- },
- {
- "expr": "histogram_quantile(0.5, sum(rate(http_request_duration_seconds_bucket{app=\"$container\", kubernetes_namespace=\"$namespace\"}[30s])) by (app,kubernetes_namespace,le))",
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "native | 0.50",
- "refId": "C",
- "step": 1
- },
- {
- "expr": "histogram_quantile(0.99, sum(rate(nginx_http_request_duration_seconds_bucket{app=\"$container\", kubernetes_namespace=\"$namespace\"}[30s])) by (app,kubernetes_namespace,le))",
- "intervalFactor": 1,
- "legendFormat": "nginx | 0.99",
- "refId": "D",
- "step": 1
- },
- {
- "expr": "histogram_quantile(0.9, sum(rate(nginx_http_request_duration_seconds_bucket{app=\"$container\", kubernetes_namespace=\"$namespace\"}[30s])) by (app,kubernetes_namespace,le))",
- "intervalFactor": 1,
- "legendFormat": "nginx | 0.90",
- "refId": "E",
- "step": 1
- },
- {
- "expr": "histogram_quantile(0.5, sum(rate(nginx_http_request_duration_seconds_bucket{app=\"$container\", kubernetes_namespace=\"$namespace\"}[30s])) by (app,kubernetes_namespace,le))",
- "intervalFactor": 1,
- "legendFormat": "nginx | 0.50",
- "refId": "F",
- "step": 1
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Response time percentiles",
- "tooltip": {
- "msResolution": true,
- "shared": true,
- "sort": 0,
- "value_type": "cumulative"
- },
- "type": "graph",
- "xaxis": {
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "s",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ]
- }
- ],
- "repeat": null,
- "repeatIteration": null,
- "repeatRowId": null,
- "showTitle": false,
- "title": "Response time",
- "titleSize": "h6"
- },
- {
- "collapse": false,
- "height": 250,
- "panels": [
- {
- "aliasColors": {},
- "bars": false,
- "datasource": "Prometheus",
- "editable": true,
- "error": false,
- "fill": 1,
- "id": 7,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "max": true,
- "min": false,
- "rightSide": true,
- "show": true,
- "sort": "avg",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "span": 12,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "count(count(container_memory_usage_bytes{container_name=\"$container\", namespace=\"$namespace\"}) by (pod_name))",
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "pods",
- "refId": "A",
- "step": 5
- },
- {
- "expr": "count(count(container_memory_usage_bytes{container_name=\"$container\", namespace=\"$namespace\"}) by (kubernetes_io_hostname))",
- "interval": "",
- "intervalFactor": 2,
- "legendFormat": "hosts",
- "refId": "B",
- "step": 10
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Number of pods",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ]
- }
- ],
- "repeat": null,
- "repeatIteration": null,
- "repeatRowId": null,
- "showTitle": false,
- "title": "Pod count",
- "titleSize": "h6"
- },
- {
- "collapse": false,
- "height": 250,
- "panels": [
- {
- "aliasColors": {},
- "bars": false,
- "datasource": "Prometheus",
- "editable": true,
- "error": false,
- "fill": 1,
- "id": 12,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "max": true,
- "min": false,
- "rightSide": true,
- "show": true,
- "sort": "avg",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [
- {
- "alias": "elasticsearch-logging-data-20170207a (logging) - system",
- "color": "#BF1B00"
- },
- {
- "alias": "elasticsearch-logging-data-20170207a (logging) - user",
- "color": "#508642"
- }
- ],
- "span": 12,
- "stack": true,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum(irate(container_cpu_system_seconds_total{container_name=\"$container\", namespace=\"$namespace\"}[30s])) by (namespace,container_name) / sum(container_spec_cpu_shares{container_name=\"$container\", namespace=\"$namespace\"} / 1024) by (namespace,container_name)",
- "intervalFactor": 2,
- "legendFormat": "system",
- "refId": "C",
- "step": 10
- },
- {
- "expr": "sum(irate(container_cpu_user_seconds_total{container_name=\"$container\", namespace=\"$namespace\"}[30s])) by (namespace,container_name) / sum(container_spec_cpu_shares{container_name=\"$container\", namespace=\"$namespace\"} / 1024) by (namespace,container_name)",
- "interval": "",
- "intervalFactor": 2,
- "legendFormat": "user",
- "refId": "B",
- "step": 10
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Cpu usage (relative to request)",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "percentunit",
- "label": "",
- "logBase": 1,
- "max": "1",
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ]
- }
- ],
- "repeat": null,
- "repeatIteration": null,
- "repeatRowId": null,
- "showTitle": false,
- "title": "Usage relative to request",
- "titleSize": "h6"
- },
- {
- "collapse": true,
- "height": 250,
- "panels": [
- {
- "aliasColors": {},
- "bars": false,
- "datasource": "Prometheus",
- "editable": true,
- "error": false,
- "fill": 1,
- "id": 10,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "max": true,
- "min": false,
- "rightSide": true,
- "show": true,
- "sort": "avg",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "span": 6,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum(irate(container_cpu_usage_seconds_total{container_name=\"$container\", namespace=\"$namespace\"}[30s])) by (namespace,container_name) / sum(container_spec_cpu_quota{container_name=\"$container\", namespace=\"$namespace\"} / container_spec_cpu_period{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name)",
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "actual",
- "metric": "",
- "refId": "A",
- "step": 1
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Cpu usage (relative to limit)",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "percentunit",
- "label": "",
- "logBase": 1,
- "max": "1",
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ]
- },
- {
- "aliasColors": {},
- "bars": false,
- "datasource": "Prometheus",
- "editable": true,
- "error": false,
- "fill": 1,
- "id": 11,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "max": true,
- "min": false,
- "rightSide": true,
- "show": true,
- "sort": "avg",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "span": 6,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum(container_memory_usage_bytes{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name) / sum(container_spec_memory_limit_bytes{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name)",
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "actual",
- "refId": "A",
- "step": 1
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Memory usage (relative to limit)",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "percentunit",
- "label": null,
- "logBase": 1,
- "max": "1",
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ]
- }
- ],
- "repeat": null,
- "repeatIteration": null,
- "repeatRowId": null,
- "showTitle": false,
- "title": "Usage relative to limit",
- "titleSize": "h6"
- },
- {
- "collapse": true,
- "height": 250,
- "panels": [
- {
- "aliasColors": {},
- "bars": false,
- "datasource": "Prometheus",
- "fill": 1,
- "id": 13,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "max": true,
- "min": false,
- "rightSide": true,
- "show": true,
- "sort": "avg",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "span": 6,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum(irate(container_cpu_usage_seconds_total{container_name=\"$container\", namespace=\"$namespace\"}[30s])) by (id,pod_name)",
- "interval": "",
- "intervalFactor": 2,
- "legendFormat": "{{pod_name}}",
- "refId": "A",
- "step": 2
- },
- {
- "expr": "sum(container_spec_cpu_quota{container_name=\"$container\", namespace=\"$namespace\"} / container_spec_cpu_period{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name) / count(container_memory_usage_bytes{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name) ",
- "intervalFactor": 2,
- "legendFormat": "limit",
- "refId": "B",
- "step": 2
- },
- {
- "expr": "sum(container_spec_cpu_shares{container_name=\"$container\", namespace=\"$namespace\"} / 1024) by (namespace,container_name) / count(container_spec_cpu_shares{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name) ",
- "intervalFactor": 2,
- "legendFormat": "request",
- "refId": "C",
- "step": 2
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Cpu usage (per pod)",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "short",
- "label": "cores",
- "logBase": 1,
- "max": null,
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ]
- },
- {
- "aliasColors": {},
- "bars": false,
- "datasource": "Prometheus",
- "fill": 1,
- "id": 14,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "max": true,
- "min": false,
- "rightSide": true,
- "show": true,
- "sort": "avg",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "span": 6,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum(container_memory_usage_bytes{container_name=\"$container\", namespace=\"$namespace\"}) by (id,pod_name)",
- "interval": "",
- "intervalFactor": 2,
- "legendFormat": "{{pod_name}}",
- "refId": "A",
- "step": 2
- },
- {
- "expr": "sum(container_spec_memory_limit_bytes{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name) / count(container_memory_usage_bytes{container_name=\"$container\", namespace=\"$namespace\"}) by (container_name,namespace)",
- "intervalFactor": 2,
- "legendFormat": "limit",
- "refId": "B",
- "step": 2
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Memory usage (per pod)",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "bytes",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ]
- }
- ],
- "repeat": null,
- "repeatIteration": null,
- "repeatRowId": null,
- "showTitle": false,
- "title": "Usage per pod",
- "titleSize": "h6"
- },
- {
- "collapse": true,
- "height": 250,
- "panels": [
- {
- "aliasColors": {},
- "bars": false,
- "datasource": "Prometheus",
- "editable": true,
- "error": false,
- "fill": 1,
- "id": 8,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "max": true,
- "min": false,
- "rightSide": true,
- "show": true,
- "sort": "avg",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "span": 6,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum(irate(container_cpu_usage_seconds_total{container_name=\"$container\", namespace=\"$namespace\"}[30s])) by (namespace,container_name) / count(container_memory_usage_bytes{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name) ",
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "actual",
- "refId": "A",
- "step": 1
- },
- {
- "expr": "sum(container_spec_cpu_quota{container_name=\"$container\", namespace=\"$namespace\"} / container_spec_cpu_period{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name) / count(container_memory_usage_bytes{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name) ",
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "limit",
- "refId": "B",
- "step": 1
- },
- {
- "expr": "sum(container_spec_cpu_shares{container_name=\"$container\", namespace=\"$namespace\"} / 1024) by (namespace,container_name) / count(container_spec_cpu_shares{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name) ",
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "request",
- "refId": "C",
- "step": 1
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Cpu usage (avg per pod)",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "none",
- "label": "cores",
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ]
- },
- {
- "aliasColors": {},
- "bars": false,
- "datasource": "Prometheus",
- "editable": true,
- "error": false,
- "fill": 1,
- "id": 9,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "max": true,
- "min": false,
- "rightSide": true,
- "show": true,
- "sort": "avg",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "span": 6,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum(container_memory_usage_bytes{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name) / count(container_memory_usage_bytes{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name) ",
- "intervalFactor": 1,
- "legendFormat": "actual",
- "metric": "",
- "refId": "A",
- "step": 1
- },
- {
- "expr": "sum(container_spec_memory_limit_bytes{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name) / count(container_memory_usage_bytes{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name) ",
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "limit",
- "refId": "B",
- "step": 1
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Memory usage (avg per pod)",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "bytes",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ]
- }
- ],
- "repeat": null,
- "repeatIteration": null,
- "repeatRowId": null,
- "showTitle": false,
- "title": "Usage per pod (average)",
- "titleSize": "h6"
- },
- {
- "collapse": true,
- "height": 259.4375,
- "panels": [
- {
- "aliasColors": {},
- "bars": false,
- "datasource": "Prometheus",
- "editable": true,
- "error": false,
- "fill": 1,
- "grid": {},
- "id": 1,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "max": true,
- "min": false,
- "rightSide": true,
- "show": true,
- "sort": "avg",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "span": 6,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum(irate(container_cpu_usage_seconds_total{container_name=\"$container\", namespace=\"$namespace\"}[30s])) by (namespace,container_name)",
- "hide": false,
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "actual",
- "metric": "",
- "refId": "A",
- "step": 1
- },
- {
- "expr": "sum(container_spec_cpu_quota{container_name=\"$container\", namespace=\"$namespace\"} / container_spec_cpu_period{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name)",
- "intervalFactor": 1,
- "legendFormat": "limit",
- "refId": "B",
- "step": 1
- },
- {
- "expr": "sum(container_spec_cpu_shares{container_name=\"$container\", namespace=\"$namespace\"} / 1024) by (namespace,container_name) ",
- "intervalFactor": 1,
- "legendFormat": "request",
- "refId": "C",
- "step": 1
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Cpu usage (total)",
- "tooltip": {
- "msResolution": true,
- "shared": false,
- "sort": 0,
- "value_type": "cumulative"
- },
- "type": "graph",
- "xaxis": {
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "none",
- "label": "cores",
- "logBase": 1,
- "max": null,
- "min": 0,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ]
- },
- {
- "aliasColors": {},
- "bars": false,
- "datasource": "Prometheus",
- "editable": true,
- "error": false,
- "fill": 1,
- "grid": {},
- "id": 2,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "max": true,
- "min": false,
- "rightSide": true,
- "show": true,
- "sort": "avg",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "span": 6,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum(container_memory_usage_bytes{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name)",
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "actual",
- "refId": "A",
- "step": 1
- },
- {
- "expr": "sum(container_spec_memory_limit_bytes{container_name=\"$container\", namespace=\"$namespace\"}) by (namespace,container_name)",
- "intervalFactor": 1,
- "legendFormat": "limit",
- "refId": "B",
- "step": 1
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Memory usage (total)",
- "tooltip": {
- "msResolution": true,
- "shared": false,
- "sort": 0,
- "value_type": "cumulative"
- },
- "type": "graph",
- "xaxis": {
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "bytes",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ]
- }
- ],
- "repeat": null,
- "repeatIteration": null,
- "repeatRowId": null,
- "showTitle": false,
- "title": "Usage total",
- "titleSize": "h6"
- }
- ],
- "schemaVersion": 14,
- "style": "dark",
- "tags": [],
- "templating": {
- "list": [
- {
- "allValue": ".+",
- "current": {},
- "datasource": "Prometheus",
- "hide": 0,
- "includeAll": false,
- "label": null,
- "multi": false,
- "name": "namespace",
- "options": [],
- "query": "label_values(container_memory_usage_bytes{namespace=~\".+\",container_name!=\"POD\"},namespace)",
- "refresh": 1,
- "regex": "",
- "sort": 1,
- "tagValuesQuery": null,
- "tags": [],
- "tagsQuery": null,
- "type": "query",
- "useTags": false
- },
- {
- "allValue": ".+",
- "current": {},
- "datasource": "Prometheus",
- "hide": 0,
- "includeAll": false,
- "label": null,
- "multi": false,
- "name": "container",
- "options": [],
- "query": "label_values(container_memory_usage_bytes{namespace=~\"$namespace\",container_name!=\"POD\"},container_name)",
- "refresh": 1,
- "regex": "",
- "sort": 1,
- "tagValuesQuery": null,
- "tags": [],
- "tagsQuery": null,
- "type": "query",
- "useTags": false
- }
- ]
- },
- "time": {
- "from": "now-3h",
- "to": "now"
- },
- "timepicker": {
- "refresh_intervals": [
- "5s",
- "10s",
- "30s",
- "1m",
- "5m",
- "15m",
- "30m",
- "1h",
- "2h",
- "1d"
- ],
- "time_options": [
- "5m",
- "15m",
- "1h",
- "6h",
- "12h",
- "24h",
- "2d",
- "7d",
- "30d"
- ]
- },
- "timezone": "browser",
- "title": "Kubernetes App Metrics",
- "version": 37,
- "description": "After selecting your namespace and container you get a wealth of metrics like request rate, error rate, response times, pod count, cpu and memory usage. You can view cpu and memory usage in a variety of ways, compared to the limit, compared to the request, per pod, average per pod, etc."
- }
\ No newline at end of file
diff --git a/helm-charts/nem-monitoring/grafana-dashboards/voltha-kpi.json b/helm-charts/nem-monitoring/grafana-dashboards/voltha-kpi.json
deleted file mode 100644
index 68c3b82..0000000
--- a/helm-charts/nem-monitoring/grafana-dashboards/voltha-kpi.json
+++ /dev/null
@@ -1,564 +0,0 @@
-{
- "annotations": {
- "list": [
- {
- "builtIn": 1,
- "datasource": "-- Grafana --",
- "enable": true,
- "hide": true,
- "iconColor": "rgba(0, 211, 255, 1)",
- "name": "Annotations & Alerts",
- "type": "dashboard"
- }
- ]
- },
- "editable": true,
- "gnetId": null,
- "graphTooltip": 0,
- "links": [],
- "panels": [
- {
- "gridPos": {
- "h": 1,
- "w": 24,
- "x": 0,
- "y": 0
- },
- "id": 7,
- "title": "Bytes",
- "type": "row"
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "Prometheus",
- "description": "Count the tx bytes on the NNI ports by device",
- "fill": 1,
- "gridPos": {
- "h": 9,
- "w": 12,
- "x": 0,
- "y": 1
- },
- "id": 9,
- "legend": {
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum(tx_bytes_total{port_type=\"nni\"})by(device_id) / 1024 / 1024",
- "format": "time_series",
- "intervalFactor": 1,
- "refId": "A"
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Transmitted MB by device",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "Prometheus",
- "description": "Count the rx bytes on the NNI ports by device",
- "fill": 1,
- "gridPos": {
- "h": 9,
- "w": 12,
- "x": 12,
- "y": 1
- },
- "id": 10,
- "legend": {
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum(rx_bytes_total{port_type=\"nni\"})by(device_id) / 1024 / 1024",
- "format": "time_series",
- "intervalFactor": 1,
- "refId": "A"
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Received MB by device",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "collapsed": false,
- "gridPos": {
- "h": 1,
- "w": 24,
- "x": 0,
- "y": 10
- },
- "id": 2,
- "panels": [],
- "title": "Packets",
- "type": "row"
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "Prometheus",
- "description": "Count the tx packets on the NNI ports by device",
- "fill": 1,
- "gridPos": {
- "h": 9,
- "w": 12,
- "x": 0,
- "y": 11
- },
- "id": 4,
- "legend": {
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum(tx_packets_total{port_type=\"nni\"})by(device_id)",
- "format": "time_series",
- "intervalFactor": 1,
- "refId": "A"
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Transmitted packets by device",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "Prometheus",
- "description": "Count the rx packets on the NNI ports by device",
- "fill": 1,
- "gridPos": {
- "h": 9,
- "w": 12,
- "x": 12,
- "y": 11
- },
- "id": 5,
- "legend": {
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum(rx_packets_total{port_type=\"nni\"})by(device_id)",
- "format": "time_series",
- "intervalFactor": 1,
- "refId": "A"
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Received packets by device",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "collapsed": true,
- "gridPos": {
- "h": 1,
- "w": 24,
- "x": 0,
- "y": 20
- },
- "id": 14,
- "panels": [
- {
- "alert": {
- "conditions": [
- {
- "evaluator": {
- "params": [
- 5
- ],
- "type": "gt"
- },
- "operator": {
- "type": "and"
- },
- "query": {
- "params": [
- "A",
- "1m",
- "now"
- ]
- },
- "reducer": {
- "params": [],
- "type": "sum"
- },
- "type": "query"
- }
- ],
- "executionErrorState": "alerting",
- "frequency": "60s",
- "handler": 1,
- "name": "Realtime Incoming MB by NNI port alert",
- "noDataState": "no_data",
- "notifications": []
- },
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "fill": 1,
- "gridPos": {
- "h": 10,
- "w": 24,
- "x": 0,
- "y": 21
- },
- "id": 12,
- "legend": {
- "avg": false,
- "current": false,
- "hideEmpty": true,
- "hideZero": true,
- "max": false,
- "min": false,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "$$hashKey": "object:362",
- "expr": "delta(rx_bytes_total{port_type=\"nni\"}[30s]) / 1024 / 1024",
- "format": "time_series",
- "intervalFactor": 1,
- "refId": "A"
- }
- ],
- "thresholds": [
- {
- "colorMode": "critical",
- "fill": true,
- "line": true,
- "op": "gt",
- "value": 5
- }
- ],
- "timeFrom": null,
- "timeShift": null,
- "title": "Realtime Incoming MB by NNI port",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "$$hashKey": "object:421",
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "$$hashKey": "object:422",
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- }
- ],
- "title": "Realtime Traffic Data",
- "type": "row"
- }
- ],
- "refresh": "15s",
- "schemaVersion": 16,
- "style": "dark",
- "tags": [],
- "templating": {
- "list": []
- },
- "time": {
- "from": "now-5m",
- "to": "now"
- },
- "timepicker": {
- "refresh_intervals": [
- "5s",
- "10s",
- "30s",
- "1m",
- "5m",
- "15m",
- "30m",
- "1h",
- "2h",
- "1d"
- ],
- "time_options": [
- "5m",
- "15m",
- "1h",
- "6h",
- "12h",
- "24h",
- "2d",
- "7d",
- "30d"
- ]
- },
- "timezone": "",
- "title": "Voltha",
- "uid": "i9V9JtOmz",
- "version": 1
-}
\ No newline at end of file
diff --git a/helm-charts/nem-monitoring/requirements.yaml b/helm-charts/nem-monitoring/requirements.yaml
deleted file mode 100644
index a55e7ea..0000000
--- a/helm-charts/nem-monitoring/requirements.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# 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.
-
-dependencies:
-- name: prometheus
- version: 6.8.1
- repository: https://kubernetes-charts.storage.googleapis.com/
-- name: grafana
- version: 1.12.0
- repository: https://kubernetes-charts.storage.googleapis.com/
-
diff --git a/helm-charts/nem-monitoring/templates/NOTES.txt b/helm-charts/nem-monitoring/templates/NOTES.txt
deleted file mode 100644
index 780bf45..0000000
--- a/helm-charts/nem-monitoring/templates/NOTES.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Thank you for installing {{ .Chart.Name }}.
-
-Your release is named {{ .Release.Name }}.
-
-You can now access Grafana at: <cluster-ip>:31300
-using:
-
-username: {{ .Values.grafana.adminUser}}
-password: {{ .Values.grafana.adminPassword}}
-
-and Prometheus at: <cluster-ip>:31301
-
diff --git a/helm-charts/nem-monitoring/templates/grafana-dashboard-kb8s-configmap.yaml b/helm-charts/nem-monitoring/templates/grafana-dashboard-kb8s-configmap.yaml
deleted file mode 100644
index 3334c51..0000000
--- a/helm-charts/nem-monitoring/templates/grafana-dashboard-kb8s-configmap.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-#
-# 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.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: grafana-dashboard-kb8s
- labels:
- grafana_dashboard: "1"
-data:
- kb8s.json: |
-{{ .Files.Get "grafana-dashboards/kb8s-app-metrics.json" | indent 4 }}
\ No newline at end of file
diff --git a/helm-charts/nem-monitoring/templates/grafana-dashboard-voltha-configmap.yaml b/helm-charts/nem-monitoring/templates/grafana-dashboard-voltha-configmap.yaml
deleted file mode 100644
index efbb0dd..0000000
--- a/helm-charts/nem-monitoring/templates/grafana-dashboard-voltha-configmap.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-#
-# 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.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: grafana-dashboard-voltha
- labels:
- grafana_dashboard: "1"
-data:
- voltha.json: |
-{{ .Files.Get "grafana-dashboards/voltha-kpi.json" | indent 4 }}
\ No newline at end of file
diff --git a/helm-charts/nem-monitoring/templates/voltha-exporter-deployment.yaml b/helm-charts/nem-monitoring/templates/voltha-exporter-deployment.yaml
deleted file mode 100644
index f69f163..0000000
--- a/helm-charts/nem-monitoring/templates/voltha-exporter-deployment.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# 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.
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
- name: voltha-kpi-exporter
- labels:
- release: {{ .Release.Name }}
-spec:
- replicas: 2
- template:
- metadata:
- labels:
- app: voltha-kpi-exporter
- release: {{ .Release.Name }}
- spec:
- containers:
- - name: voltha-kpi-exporter
- image: {{ tpl .Values.nem_voltha_kpi_exporter_image . | quote }}
- imagePullPolicy: {{ .Values.imagePullPolicy }}
- args: ["-broker={{ .Values.args.voltha_kpi_broker }}", "-topic={{ .Values.args.voltha_kpi_topic }}"]
- ports:
- - containerPort: 8080
- port: 8080
- protocol: TCP
diff --git a/helm-charts/nem-monitoring/templates/voltha-exporter-service.yaml b/helm-charts/nem-monitoring/templates/voltha-exporter-service.yaml
deleted file mode 100644
index 60a67f4..0000000
--- a/helm-charts/nem-monitoring/templates/voltha-exporter-service.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# 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.
-
-apiVersion: v1
-kind: Service
-metadata:
- name: voltha-kpi-exporter
- labels:
- release: {{ .Release.Name }}
-spec:
- type: NodePort
- ports:
- - port: 8080
- targetPort: 8080
- nodePort: {{ .Values.nem_voltha_kpi_exporter_nodePort }}
- protocol: TCP
- selector:
- app: "voltha-kpi-exporter"
diff --git a/helm-charts/nem-monitoring/values.yaml b/helm-charts/nem-monitoring/values.yaml
deleted file mode 100644
index 7efe71d..0000000
--- a/helm-charts/nem-monitoring/values.yaml
+++ /dev/null
@@ -1,205 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-#
-# 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.
-
-nem_voltha_kpi_exporter_image: "matteoscandolo/prometheus-go-exporter:latest"
-nem_voltha_kpi_exporter_nodePort: 31080
-imagePullPolicy: "Always"
-args:
- voltha_kpi_broker: seba-substrate-voltha-kafka:9092
- voltha_kpi_topic: voltha.kpis
-
-prometheus:
- alertmanager:
- persistentVolume:
- enabled: false
- server:
- persistentVolume:
- enabled: false
- service:
- type: NodePort
- nodePort: 31301
- serverFiles:
- alerts: {}
- rules: {}
-
- prometheus.yml:
- rule_files:
- - /etc/config/rules
- - /etc/config/alerts
-
- scrape_configs:
- # voltha KPI
- - job_name: 'voltha-kpi'
- metrics_path: /metrics
- scrape_interval: 15s
- static_configs:
- - targets:
- - voltha-kpi-exporter:8080
-
- # KB8s monitoring jobs
- - job_name: prometheus
- static_configs:
- - targets:
- - localhost:9090
- - job_name: 'kubernetes-apiservers'
- kubernetes_sd_configs:
- - role: endpoints
- scheme: https
- tls_config:
- ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
- insecure_skip_verify: true
- bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
- relabel_configs:
- - source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_service_name, __meta_kubernetes_endpoint_port_name]
- action: keep
- regex: default;kubernetes;https
- - job_name: 'kubernetes-nodes'
- # Default to scraping over https. If required, just disable this or change to
- # `http`.
- scheme: https
- tls_config:
- ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
- insecure_skip_verify: true
- bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
- kubernetes_sd_configs:
- - role: node
- relabel_configs:
- - action: labelmap
- regex: __meta_kubernetes_node_label_(.+)
- - target_label: __address__
- replacement: kubernetes.default.svc:443
- - source_labels: [__meta_kubernetes_node_name]
- regex: (.+)
- target_label: __metrics_path__
- replacement: /api/v1/nodes/${1}/proxy/metrics
- - job_name: 'kubernetes-nodes-cadvisor'
- scheme: https
- tls_config:
- ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
- insecure_skip_verify: true
- bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
- kubernetes_sd_configs:
- - role: node
- relabel_configs:
- - action: labelmap
- regex: __meta_kubernetes_node_label_(.+)
- - target_label: __address__
- replacement: kubernetes.default.svc:443
- - source_labels: [__meta_kubernetes_node_name]
- regex: (.+)
- target_label: __metrics_path__
- replacement: /api/v1/nodes/${1}/proxy/metrics/cadvisor
- - job_name: 'kubernetes-service-endpoints'
- kubernetes_sd_configs:
- - role: endpoints
- relabel_configs:
- - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape]
- action: keep
- regex: true
- - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme]
- action: replace
- target_label: __scheme__
- regex: (https?)
- - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_path]
- action: replace
- target_label: __metrics_path__
- regex: (.+)
- - source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port]
- action: replace
- target_label: __address__
- regex: ([^:]+)(?::\d+)?;(\d+)
- replacement: $1:$2
- - action: labelmap
- regex: __meta_kubernetes_service_label_(.+)
- - source_labels: [__meta_kubernetes_namespace]
- action: replace
- target_label: kubernetes_namespace
- - source_labels: [__meta_kubernetes_service_name]
- action: replace
- target_label: kubernetes_name
- - job_name: 'prometheus-pushgateway'
- honor_labels: true
- kubernetes_sd_configs:
- - role: service
- relabel_configs:
- - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_probe]
- action: keep
- regex: pushgateway
- - job_name: 'kubernetes-services'
- metrics_path: /probe
- params:
- module: [http_2xx]
- kubernetes_sd_configs:
- - role: service
- relabel_configs:
- - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_probe]
- action: keep
- regex: true
- - source_labels: [__address__]
- target_label: __param_target
- - target_label: __address__
- replacement: blackbox
- - source_labels: [__param_target]
- target_label: instance
- - action: labelmap
- regex: __meta_kubernetes_service_label_(.+)
- - source_labels: [__meta_kubernetes_namespace]
- target_label: kubernetes_namespace
- - source_labels: [__meta_kubernetes_service_name]
- target_label: kubernetes_name
- - job_name: 'kubernetes-pods'
- kubernetes_sd_configs:
- - role: pod
- relabel_configs:
- - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
- action: keep
- regex: true
- - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path]
- action: replace
- target_label: __metrics_path__
- regex: (.+)
- - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
- action: replace
- regex: ([^:]+)(?::\d+)?;(\d+)
- replacement: $1:$2
- target_label: __address__
- - action: labelmap
- regex: __meta_kubernetes_pod_label_(.+)
- - source_labels: [__meta_kubernetes_namespace]
- action: replace
- target_label: kubernetes_namespace
- - source_labels: [__meta_kubernetes_pod_name]
- action: replace
- target_label: kubernetes_pod_name
-
-grafana:
- adminUser: admin
- adminPassword: strongpassword
- service:
- type: NodePort
- nodePort: 31300
- sidecar:
- dashboards:
- enabled: true
- label: grafana_dashboard
- datasources:
- datasources.yaml:
- apiVersion: 1
- datasources:
- - name: Prometheus
- type: prometheus
- url: http://nem-monitoring-prometheus-server.default.svc.cluster.local
- access: proxy
- isDefault: true
\ No newline at end of file
diff --git a/helm-charts/profile/bng-in-fabric/.helmignore b/helm-charts/profile/bng-in-fabric/.helmignore
deleted file mode 100644
index f0c1319..0000000
--- a/helm-charts/profile/bng-in-fabric/.helmignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
diff --git a/helm-charts/profile/bng-in-fabric/Chart.yaml b/helm-charts/profile/bng-in-fabric/Chart.yaml
deleted file mode 100644
index b98397b..0000000
--- a/helm-charts/profile/bng-in-fabric/Chart.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-
-# Copyright 2018-present Open Networking Foundation
-#
-# 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.
-
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for NEM's "bng-in-fabric" profile
-name: bng-in-fabric
-version: 0.1.0
diff --git a/helm-charts/profile/bng-in-fabric/requirements.yaml b/helm-charts/profile/bng-in-fabric/requirements.yaml
deleted file mode 100644
index f6758b5..0000000
--- a/helm-charts/profile/bng-in-fabric/requirements.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-#
-# 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.
-
-dependencies:
-- name: rcord
- version: 1.1.0-dev
- repository: https://charts.opencord.org/master/
-- name: onos-service
- version: 2.0.1
- repository: https://charts.opencord.org/master/
-- name: fabric
- version: 2.0.0
- repository: https://charts.opencord.org/master/
-- name: volt
- version: 2.0.1
- repository: https://charts.opencord.org/master/
-- name: vsg-hw
- version: 1.0.0
- repository: https://charts.opencord.org/master/
-- name: vrouter
- version: 2.0.0
- repository: https://charts.opencord.org/master/
-- name: hippie-oss
- version: 1.1.0-dev
- repository: https://charts.opencord.org/master/
diff --git a/helm-charts/profile/bng-in-fabric/templates/_helpers.tpl b/helm-charts/profile/bng-in-fabric/templates/_helpers.tpl
deleted file mode 100644
index 1cf7cbb..0000000
--- a/helm-charts/profile/bng-in-fabric/templates/_helpers.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Copyright 2018-present Open Networking Foundation
-
-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.
-*/}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "bng-in-fabric.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "bng-in-fabric.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "bng-in-fabric.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
diff --git a/helm-charts/profile/bng-in-fabric/templates/_tosca.tpl b/helm-charts/profile/bng-in-fabric/templates/_tosca.tpl
deleted file mode 100644
index cb6aebb..0000000
--- a/helm-charts/profile/bng-in-fabric/templates/_tosca.tpl
+++ /dev/null
@@ -1,255 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Copyright 2018-present Open Networking Foundation
-
-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.
-*/}}
-{{- define "bng-in-fabric.basicFixturesTosca" -}}
-tosca_definitions_version: tosca_simple_yaml_1_0
-description: Some basic fixtures
-imports:
- - custom_types/siterole.yaml
- - custom_types/slicerole.yaml
- - custom_types/networkparametertype.yaml
- - custom_types/networktemplate.yaml
- - custom_types/deployment.yaml
-topology_template:
- node_templates:
-
-# -----------------------------------------------------------------------------
-# Network Parameter Types
-# -----------------------------------------------------------------------------
- s_tag:
- type: tosca.nodes.NetworkParameterType
- properties:
- name: s_tag
- c_tag:
- type: tosca.nodes.NetworkParameterType
- properties:
- name: c_tag
- next_hop:
- type: tosca.nodes.NetworkParameterType
- properties:
- name: next_hop
- device:
- type: tosca.nodes.NetworkParameterType
- properties:
- name: device
- bridge:
- type: tosca.nodes.NetworkParameterType
- properties:
- name: bridge
- neutron_port_name:
- type: tosca.nodes.NetworkParameterType
- properties:
- name: neutron_port_name
-
-# ----------------------------------------------------------------------------
-# Roles
-# ----------------------------------------------------------------------------
- siterole#admin:
- type: tosca.nodes.SiteRole
- properties:
- role: admin
- siterole#pi:
- type: tosca.nodes.SiteRole
- properties:
- role: pi
- siterole#tech:
- type: tosca.nodes.SiteRole
- properties:
- role: tech
- slicerole#admin:
- type: tosca.nodes.SliceRole
- properties:
- role: admin
- slicerole#access:
- type: tosca.nodes.SliceRole
- properties:
- role: access
-
-# -----------------------------------------------------------------------------
-# Network Templates
-# -----------------------------------------------------------------------------
- Private:
- type: tosca.nodes.NetworkTemplate
- properties:
- name: Private
- visibility: private
- translation: none
-
- Public shared IPv4:
- type: tosca.nodes.NetworkTemplate
- properties:
- name: Public shared IPv4
- visibility: private
- translation: NAT
- shared_network_name: nat-net
-
- Public dedicated IPv4:
- type: tosca.nodes.NetworkTemplate
- properties:
- name: Public dedicated IPv4
- visibility: public
- translation: none
- shared_network_name: ext-net
-
-# -----------------------------------------------------------------------------
-# Deployment
-# -----------------------------------------------------------------------------
- MyDeployment:
- type: tosca.nodes.Deployment
- properties:
- name: MyDeployment
-{{- end -}}
-
-
-{{- define "bng-in-fabric.serviceGraphTosca" -}}
-tosca_definitions_version: tosca_simple_yaml_1_0
-imports:
- - custom_types/fabricservice.yaml
- - custom_types/onosservice.yaml
- - custom_types/rcordservice.yaml
- - custom_types/vrouterservice.yaml
- - custom_types/voltservice.yaml
- - custom_types/vsghwservice.yaml
- - custom_types/servicedependency.yaml
- - custom_types/servicegraphconstraint.yaml
-description: NEM's bng-in-fabric service graph
-topology_template:
- node_templates:
-
-# These services must be defined before loading the graph
-
- service#ONOS_Fabric:
- type: tosca.nodes.ONOSService
- properties:
- name: ONOS_Fabric
- must-exist: true
-
- service#ONOS_VOLTHA:
- type: tosca.nodes.ONOSService
- properties:
- name: ONOS_VOLTHA
- must-exist: true
-
- service#fabric:
- type: tosca.nodes.FabricService
- properties:
- name: fabric
- must-exist: true
-
- service#rcord:
- type: tosca.nodes.RCORDService
- properties:
- name: rcord
- must-exist: true
-
- service#vrouter:
- type: tosca.nodes.VRouterService
- properties:
- name: vrouter
- must-exist: true
-
- service#volt:
- type: tosca.nodes.VOLTService
- properties:
- name: volt
- must-exist: true
-
- service#vsg-hw:
- type: tosca.nodes.VSGHWService
- properties:
- name: vsg-hw
- must-exist: true
-
-# The service graph
-
- service_dependency#onos-fabric_fabric:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: None
- requirements:
- - subscriber_service:
- node: service#ONOS_Fabric
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#fabric
- relationship: tosca.relationships.BelongsToOne
-
- service_dependency#rcord_volt:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: None
- requirements:
- - subscriber_service:
- node: service#rcord
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#volt
- relationship: tosca.relationships.BelongsToOne
-
- service_dependency#onos_voltha_volt:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: None
- requirements:
- - subscriber_service:
- node: service#volt
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#ONOS_VOLTHA
- relationship: tosca.relationships.BelongsToOne
-
- service_dependency#fabric_vrouter:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: None
- requirements:
- - subscriber_service:
- node: service#fabric
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#vrouter
- relationship: tosca.relationships.BelongsToOne
-
- service_dependency#volt_vsg-hw:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: None
- requirements:
- - subscriber_service:
- node: service#volt
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#vsg-hw
- relationship: tosca.relationships.BelongsToOne
-
- service_dependency#onos_fabric_vsg-hw:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: None
- requirements:
- - subscriber_service:
- node: service#vsg-hw
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#ONOS_Fabric
- relationship: tosca.relationships.BelongsToOne
-
- constraints:
- type: tosca.nodes.ServiceGraphConstraint
- properties:
- constraints: '[[null, "rcord"], ["ONOS_VOLTHA", "volt"], ["ONOS_Fabric", "vsg-hw"], ["fabric", null], ["vrouter", null]]'
-{{- end -}}
-
diff --git a/helm-charts/profile/bng-in-fabric/templates/tests/test-api.yaml b/helm-charts/profile/bng-in-fabric/templates/tests/test-api.yaml
deleted file mode 100644
index 94a3ab5..0000000
--- a/helm-charts/profile/bng-in-fabric/templates/tests/test-api.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# 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.
-
-apiVersion: v1
-kind: Pod
-metadata:
- name: "{{ .Release.Name }}-api-test"
- annotations:
- "helm.sh/hook": test-success
-spec:
- restartPolicy: Never
- containers:
- - name: {{ .Release.Name }}-api-test
- image: {{ .Values.xos_api_testerImage }}
- imagePullPolicy: {{ .Values.imagePullPolicy }}
- volumeMounts:
- - name: log-volume
- mountPath: /src/cord-api/Tests/Log/
- env:
- - name: SERVER_IP
- value: 'xos-chameleon'
- - name: SERVER_PORT
- value: '9101'
- - name: XOS_USER
- value: {{ .Values.xosAdminUser | quote }}
- - name: XOS_PASSWD
- value: {{ .Values.xosAdminPassword | quote}}
- command: ["pybot", "-L", "TRACE", "-d", "Log", "-T", "VOLTDevice_Test.txt", "RCORDLite_E2ETest.txt"]
- volumes:
- - name: log-volume
- hostPath:
- path: /tmp/helm_test_bng-in-fabric_logs_{{ dateInZone "20060102T030405.00Z" (now) "UTC" }}
- type: DirectoryOrCreate
diff --git a/helm-charts/profile/bng-in-fabric/templates/tosca-configmap.yaml b/helm-charts/profile/bng-in-fabric/templates/tosca-configmap.yaml
deleted file mode 100644
index 8efaeb7..0000000
--- a/helm-charts/profile/bng-in-fabric/templates/tosca-configmap.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-
-# Copyright 2018-present Open Networking Foundation
-#
-# 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.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: bng-in-fabric-tosca
-data:
- 010-fixtures.yaml: |
-{{ include "bng-in-fabric.basicFixturesTosca" . | indent 4 }}
- 020-rcord-subscriber-service.yaml: |
-{{ include "rcord.serviceTosca" .Values.rcord | indent 4 }}
- 030-volt-service.yaml: |
-{{ include "volt.serviceTosca" .Values.volt | indent 4 }}
- 040-vsg-hw-service.yaml: |
-{{ include "vsg-hw.serviceTosca" (index .Values "vsg-hw") | indent 4 }}
- 050-vrouter-service.yaml: |
-{{ include "vrouter.serviceTosca" .Values.vrouter | indent 4 }}
- 060-onos-service-fabric.yaml: |
-{{ include "onos-service.fabricAppTosca" (index .Values "onos-service") | indent 4 }}
- 061-onos-voltha-service-fabric.yaml: |
-{{ include "onos-service.volthaOnosTosca" (index .Values "onos-service") | indent 4 }}
- 070-fabric-service.yaml: |
-{{ include "fabric.serviceTosca" .Values.fabric | indent 4 }}
- 300-service-graph.yaml: |
-{{ include "bng-in-fabric.serviceGraphTosca" . | indent 4 }}
diff --git a/helm-charts/profile/bng-in-fabric/templates/tosca-job.yaml b/helm-charts/profile/bng-in-fabric/templates/tosca-job.yaml
deleted file mode 100644
index a16ed0a..0000000
--- a/helm-charts/profile/bng-in-fabric/templates/tosca-job.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
----
-
-# Copyright 2018-present Open Networking Foundation
-#
-# 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.
-
-apiVersion: batch/v1
-kind: Job
-metadata:
- name: {{ template "bng-in-fabric.fullname" . }}-tosca-loader
- labels:
- app: {{ template "bng-in-fabric.name" . }}
- chart: {{ template "bng-in-fabric.chart" . }}
- release: {{ .Release.Name }}
- heritage: {{ .Release.Service }}
-spec:
- backoffLimit: 12
- template:
- metadata:
- labels:
- app: {{ template "bng-in-fabric.name" . }}
- release: {{ .Release.Name }}
- annotations:
- checksum/config: {{ include (print $.Template.BasePath "/tosca-configmap.yaml") . | sha256sum }}
- spec:
- restartPolicy: OnFailure
- containers:
- - name: {{ .Chart.Name }}-tosca-loader
- image: {{ tpl .Values.tosca_loaderImage . | quote }}
- imagePullPolicy: {{ .Values.imagePullPolicy }}
- env:
- - name: XOS_USER
- value: {{ .Values.xosAdminUser }}
- - name: XOS_PASSWD
- valueFrom:
- secretKeyRef:
- name: xos-admin-passwd-secret
- key: password
- volumeMounts:
- - name: bng-in-fabric-tosca
- mountPath: /opt/tosca
- volumes:
- - name: bng-in-fabric-tosca
- configMap:
- name: bng-in-fabric-tosca
diff --git a/helm-charts/profile/bng-in-fabric/values.yaml b/helm-charts/profile/bng-in-fabric/values.yaml
deleted file mode 100644
index 26afc5b..0000000
--- a/helm-charts/profile/bng-in-fabric/values.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-#
-# 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.
-
-# Default values for the bng-in-fabric profile.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-nameOverride: ""
-fullnameOverride: ""
-
-imagePullPolicy: 'Always'
-
-tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
-
-xos_api_testerImage: 'xosproject/xos-api-tester:2.0.1'
-
-xosAdminUser: "admin@opencord.org"
-xosAdminPassword: "letmein"
-
-hippie-oss:
- kafkaService: "nem-core-kafka.default.svc.cluster.local"
-volt:
- kafkaService: "nem-core-kafka.default.svc.cluster.local"
-onos-service:
- kafkaService: "nem-core-kafka.default.svc.cluster.local:9092"
- onosFabricRestService: "onos-fabric-ui.default.svc.cluster.local"
diff --git a/helm-charts/profile/nem-att/.helmignore b/helm-charts/profile/nem-att/.helmignore
deleted file mode 100644
index f0c1319..0000000
--- a/helm-charts/profile/nem-att/.helmignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
diff --git a/helm-charts/profile/nem-att/Chart.yaml b/helm-charts/profile/nem-att/Chart.yaml
deleted file mode 100644
index da92e2a..0000000
--- a/helm-charts/profile/nem-att/Chart.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-
-# Copyright 2018-present Open Networking Foundation
-#
-# 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.
-
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for NEM's "AT&T Workflow" profile
-name: nem-att
-version: 0.1.0
diff --git a/helm-charts/profile/nem-att/requirements.yaml b/helm-charts/profile/nem-att/requirements.yaml
deleted file mode 100644
index cdcc51d..0000000
--- a/helm-charts/profile/nem-att/requirements.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-#
-# 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.
-
-dependencies:
-- name: rcord
- version: 1.1.0-dev
- repository: https://charts.opencord.org/master/
-- name: onos-service
- version: 2.0.1
- repository: https://charts.opencord.org/master/
-- name: fabric
- version: 2.0.0
- repository: https://charts.opencord.org/master/
-- name: volt
- version: 2.0.1
- repository: https://charts.opencord.org/master/
-- name: hippie-oss
- version: 1.1.0-dev
- repository: https://charts.opencord.org/master/
-- name: fabric-crossconnect
- version: 1.0.0
- repository: https://charts.opencord.org/master/
diff --git a/helm-charts/profile/nem-att/templates/_helpers.tpl b/helm-charts/profile/nem-att/templates/_helpers.tpl
deleted file mode 100644
index dcebe67..0000000
--- a/helm-charts/profile/nem-att/templates/_helpers.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Copyright 2018-present Open Networking Foundation
-
-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.
-*/}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "nem-att.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "nem-att.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "nem-att.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
diff --git a/helm-charts/profile/nem-att/templates/_tosca.tpl b/helm-charts/profile/nem-att/templates/_tosca.tpl
deleted file mode 100644
index 2654134..0000000
--- a/helm-charts/profile/nem-att/templates/_tosca.tpl
+++ /dev/null
@@ -1,482 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Copyright 2018-present Open Networking Foundation
-
-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.
-*/}}
-{{- define "nem-att.basicFixturesTosca" -}}
-tosca_definitions_version: tosca_simple_yaml_1_0
-description: Some basic fixtures
-imports:
- - custom_types/siterole.yaml
- - custom_types/slicerole.yaml
- - custom_types/networkparametertype.yaml
- - custom_types/networktemplate.yaml
- - custom_types/deployment.yaml
-topology_template:
- node_templates:
-
-# -----------------------------------------------------------------------------
-# Network Parameter Types
-# -----------------------------------------------------------------------------
- s_tag:
- type: tosca.nodes.NetworkParameterType
- properties:
- name: s_tag
- c_tag:
- type: tosca.nodes.NetworkParameterType
- properties:
- name: c_tag
- next_hop:
- type: tosca.nodes.NetworkParameterType
- properties:
- name: next_hop
- device:
- type: tosca.nodes.NetworkParameterType
- properties:
- name: device
- bridge:
- type: tosca.nodes.NetworkParameterType
- properties:
- name: bridge
- neutron_port_name:
- type: tosca.nodes.NetworkParameterType
- properties:
- name: neutron_port_name
-
-# ----------------------------------------------------------------------------
-# Roles
-# ----------------------------------------------------------------------------
- siterole#admin:
- type: tosca.nodes.SiteRole
- properties:
- role: admin
- siterole#pi:
- type: tosca.nodes.SiteRole
- properties:
- role: pi
- siterole#tech:
- type: tosca.nodes.SiteRole
- properties:
- role: tech
- slicerole#admin:
- type: tosca.nodes.SliceRole
- properties:
- role: admin
- slicerole#access:
- type: tosca.nodes.SliceRole
- properties:
- role: access
-
-# -----------------------------------------------------------------------------
-# Network Templates
-# -----------------------------------------------------------------------------
- Private:
- type: tosca.nodes.NetworkTemplate
- properties:
- name: Private
- visibility: private
- translation: none
-
- Public shared IPv4:
- type: tosca.nodes.NetworkTemplate
- properties:
- name: Public shared IPv4
- visibility: private
- translation: NAT
- shared_network_name: nat-net
-
- Public dedicated IPv4:
- type: tosca.nodes.NetworkTemplate
- properties:
- name: Public dedicated IPv4
- visibility: public
- translation: none
- shared_network_name: ext-net
-
-# -----------------------------------------------------------------------------
-# Deployment
-# -----------------------------------------------------------------------------
- MyDeployment:
- type: tosca.nodes.Deployment
- properties:
- name: MyDeployment
-{{- end -}}
-
-
-{{- define "nem-att.serviceGraphTosca" -}}
-tosca_definitions_version: tosca_simple_yaml_1_0
-imports:
- - custom_types/fabricservice.yaml
- - custom_types/fabriccrossconnectservice.yaml
- - custom_types/hippieossservice.yaml
- - custom_types/onosservice.yaml
- - custom_types/rcordservice.yaml
- - custom_types/servicedependency.yaml
- - custom_types/servicegraphconstraint.yaml
- - custom_types/voltservice.yaml
-description: rcord-fc service graph
-topology_template:
- node_templates:
-
-# These services must be defined before loading the graph
-
- service#ONOS_Fabric:
- type: tosca.nodes.ONOSService
- properties:
- name: ONOS_Fabric
- must-exist: true
-
- service#ONOS_VOLTHA:
- type: tosca.nodes.ONOSService
- properties:
- name: ONOS_VOLTHA
- must-exist: true
-
- service#fabric:
- type: tosca.nodes.FabricService
- properties:
- name: fabric
- must-exist: true
-
- service#rcord:
- type: tosca.nodes.RCORDService
- properties:
- name: rcord
- must-exist: true
-
- service#volt:
- type: tosca.nodes.VOLTService
- properties:
- name: volt
- must-exist: true
-
- service#fabric-crossconnect:
- type: tosca.nodes.FabricCrossconnectService
- properties:
- name: fabric-crossconnect
- must-exist: true
-
- # The nem-att service graph
- service_dependency#onos-fabric_fabric:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: None
- requirements:
- - subscriber_service:
- node: service#ONOS_Fabric
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#fabric
- relationship: tosca.relationships.BelongsToOne
-
- service_dependency#rcord_volt:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: None
- requirements:
- - subscriber_service:
- node: service#rcord
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#volt
- relationship: tosca.relationships.BelongsToOne
-
- service_dependency#onos_voltha_volt:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: None
- requirements:
- - subscriber_service:
- node: service#volt
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#ONOS_VOLTHA
- relationship: tosca.relationships.BelongsToOne
-
- service_dependency#volt_fabric-crossconnect:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: None
- requirements:
- - subscriber_service:
- node: service#volt
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#fabric-crossconnect
- relationship: tosca.relationships.BelongsToOne
-
- service_dependency#onos_fabric_fabric-crossconnect:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: None
- requirements:
- - subscriber_service:
- node: service#fabric-crossconnect
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#ONOS_Fabric
- relationship: tosca.relationships.BelongsToOne
-
- constraints:
- type: tosca.nodes.ServiceGraphConstraint
- properties:
- constraints: '[[null, "rcord"], ["ONOS_VOLTHA", "volt"], ["ONOS_Fabric", "fabric-crossconnect"], ["fabric", null]]'
-
- # hippie-oss
- service#oss:
- type: tosca.nodes.HippieOSSService
- properties:
- name: hippie-oss
- kind: oss
- create_on_discovery: false
-
- service_dependency#oss_volt:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: None
- requirements:
- - subscriber_service:
- node: service#oss
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#volt
- relationship: tosca.relationships.BelongsToOne
-{{- end -}}
-
-{{- define "nem-att.fabricAppTosca" -}}
-tosca_definitions_version: tosca_simple_yaml_1_0
-imports:
- - custom_types/onosapp.yaml
- - custom_types/onosservice.yaml
-description: ONOS service and app for fabric
-topology_template:
- node_templates:
- service#ONOS_Fabric:
- type: tosca.nodes.ONOSService
- properties:
- name: ONOS_Fabric
- kind: platform
- rest_hostname: {{ .Values.onosFabricRestService | quote }}
- rest_port: 8181
-
- onos_app#segmentrouting:
- type: tosca.nodes.ONOSApp
- properties:
- name: org.onosproject.segmentrouting
- app_id: org.onosproject.segmentrouting
- requirements:
- - owner:
- node: service#ONOS_Fabric
- relationship: tosca.relationships.BelongsToOne
-
- onos_app#netcfghostprovider:
- type: tosca.nodes.ONOSApp
- properties:
- name: org.onosproject.netcfghostprovider
- app_id: org.onosproject.netcfghostprovider
- requirements:
- - owner:
- node: service#ONOS_Fabric
- relationship: tosca.relationships.BelongsToOne
-
- onos_app#openflow:
- type: tosca.nodes.ONOSApp
- properties:
- name: org.onosproject.openflow
- app_id: org.onosproject.openflow
- requirements:
- - owner:
- node: service#ONOS_Fabric
- relationship: tosca.relationships.BelongsToOne
-{{- end -}}
-
-{{- define "nem-att.volthaOnosTosca" -}}
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
- - custom_types/onosapp.yaml
- - custom_types/onosservice.yaml
- - custom_types/serviceinstanceattribute.yaml
-
-description: Configures the VOLTHA ONOS service
-
-topology_template:
- node_templates:
-
- service#ONOS_VOLTHA:
- type: tosca.nodes.ONOSService
- properties:
- name: ONOS_VOLTHA
- kind: platform
- rest_hostname: {{ .Values.onosVolthaRestService | quote }}
- rest_port: 8181
-
- onos_app#openflow-base:
- type: tosca.nodes.ONOSApp
- properties:
- name: openflow-base
- app_id: org.onosproject.openflow-base
- requirements:
- - owner:
- node: service#ONOS_VOLTHA
- relationship: tosca.relationships.BelongsToOne
-
- onos_app#hostprovider:
- type: tosca.nodes.ONOSApp
- properties:
- name: hostprovider
- app_id: org.onosproject.hostprovider
- requirements:
- - owner:
- node: service#ONOS_VOLTHA
- relationship: tosca.relationships.BelongsToOne
-
- onos_app#cord-config:
- type: tosca.nodes.ONOSApp
- properties:
- name: cord-config
- app_id: org.opencord.config
- url: {{ .Values.cordConfigAppUrl }}
- version: 1.4.0
- requirements:
- - owner:
- node: service#ONOS_VOLTHA
- relationship: tosca.relationships.BelongsToOne
-
- onos_app#olt:
- type: tosca.nodes.ONOSApp
- properties:
- name: olt
- app_id: org.opencord.olt
- url: {{ .Values.oltAppUrl }}
- version: 2.0.0.SNAPSHOT
- dependencies: org.opencord.config
- requirements:
- - owner:
- node: service#ONOS_VOLTHA
- relationship: tosca.relationships.BelongsToOne
-
- onos_app#sadis:
- type: tosca.nodes.ONOSApp
- properties:
- name: sadis
- app_id: org.opencord.sadis
- url: {{ .Values.sadisAppUrl }}
- version: 2.1.0
- requirements:
- - owner:
- node: service#ONOS_VOLTHA
- relationship: tosca.relationships.BelongsToOne
-
- onos_app#dhcpl2relay:
- type: tosca.nodes.ONOSApp
- properties:
- name: dhcpl2relay
- app_id: org.opencord.dhcpl2relay
- url: {{ .Values.dhcpl2relayAppUrl }}
- version: 1.5.0.SNAPSHOT
- dependencies: org.opencord.sadis
- requirements:
- - owner:
- node: service#ONOS_VOLTHA
- relationship: tosca.relationships.BelongsToOne
-
- onos_app#aaa:
- type: tosca.nodes.ONOSApp
- properties:
- name: aaa
- app_id: org.opencord.aaa
- url: {{ .Values.aaaAppUrl }}
- version: 1.8.0.SNAPSHOT
- dependencies: org.opencord.sadis
- requirements:
- - owner:
- node: service#ONOS_VOLTHA
- relationship: tosca.relationships.BelongsToOne
-
- onos_app#kafka:
- type: tosca.nodes.ONOSApp
- properties:
- name: kafka
- app_id: org.opencord.kafka
- url: {{ .Values.kafkaAppUrl }}
- version: 1.0.0.SNAPSHOT
- dependencies: org.opencord.olt,org.opencord.aaa,org.opencord.dhcpl2relay
- requirements:
- - owner:
- node: service#ONOS_VOLTHA
- relationship: tosca.relationships.BelongsToOne
-
- # CORD-Configuration
- cord-config-attr:
- type: tosca.nodes.ServiceInstanceAttribute
- properties:
- name: /onos/v1/network/configuration/apps/org.opencord.kafka
- value: >
- {
- "kafka" : {
- "bootstrapServers" : {{ .Values.kafkaService | quote }}
- }
- }
- requirements:
- - service_instance:
- node: onos_app#olt
- relationship: tosca.relationships.BelongsToOne
-
- olt-config-attr:
- type: tosca.nodes.ServiceInstanceAttribute
- properties:
- name: /onos/v1/configuration/org.opencord.olt.impl.Olt?preset=true
- value: >
- {
- "enableDhcpOnProvisioning" : true
- }
- requirements:
- - service_instance:
- node: onos_app#olt
- relationship: tosca.relationships.BelongsToOne
-
- dhcpl2relay-config-attr:
- type: tosca.nodes.ServiceInstanceAttribute
- properties:
- name: /onos/v1/network/configuration/apps/org.opencord.dhcpl2relay
- value: >
- {
- "dhcpl2relay" : {
- "useOltUplinkForServerPktInOut" : true
- }
- }
- requirements:
- - service_instance:
- node: onos_app#dhcpl2relay
- relationship: tosca.relationships.BelongsToOne
-
- aaa-config-attr:
- type: tosca.nodes.ServiceInstanceAttribute
- properties:
- name: /onos/v1/network/configuration/apps/org.opencord.aaa
- value: >
- {
- "AAA" : {
- "radiusConnectionType" : "socket",
- "radiusHost" : "freeradius.voltha.svc.cluster.local",
- "radiusServerPort" : "1812",
- "radiusSecret" : "SECRET"
- }
- }
- requirements:
- - service_instance:
- node: onos_app#aaa
- relationship: tosca.relationships.BelongsToOne
-{{- end -}}
diff --git a/helm-charts/profile/nem-att/templates/tosca-configmap.yaml b/helm-charts/profile/nem-att/templates/tosca-configmap.yaml
deleted file mode 100644
index 00e688f..0000000
--- a/helm-charts/profile/nem-att/templates/tosca-configmap.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-
-# Copyright 2018-present Open Networking Foundation
-#
-# 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.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: nem-att-tosca
-data:
- 010-fixtures.yaml: |
-{{ include "nem-att.basicFixturesTosca" . | indent 4 }}
- 020-rcord-subscriber-service.yaml: |
-{{ include "rcord.serviceTosca" .Values.rcord | indent 4 }}
- 030-volt-service.yaml: |
-{{ include "volt.serviceTosca" .Values.volt | indent 4 }}
- 040-fabric-crossconnect-service.yaml: |
-{{ include "fabric-crossconnect.serviceTosca" (index .Values "fabric-crossconnect") | indent 4 }}
- 060-onos-fabric-apps.yaml: |
-{{ include "nem-att.fabricAppTosca" . | indent 4 }}
- 061-onos-voltha.yaml: |
-{{ include "nem-att.volthaOnosTosca" . | indent 4 }}
- 070-fabric-service.yaml: |
-{{ include "fabric.serviceTosca" .Values.fabric | indent 4 }}
- 300-service-graph.yaml: |
-{{ include "nem-att.serviceGraphTosca" . | indent 4 }}
diff --git a/helm-charts/profile/nem-att/templates/tosca-job.yaml b/helm-charts/profile/nem-att/templates/tosca-job.yaml
deleted file mode 100644
index 0e8b4b4..0000000
--- a/helm-charts/profile/nem-att/templates/tosca-job.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
----
-
-# Copyright 2018-present Open Networking Foundation
-#
-# 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.
-
-apiVersion: batch/v1
-kind: Job
-metadata:
- name: {{ template "nem-att.fullname" . }}-tosca-loader
- labels:
- app: {{ template "nem-att.name" . }}
- chart: {{ template "nem-att.chart" . }}
- release: {{ .Release.Name }}
- heritage: {{ .Release.Service }}
-spec:
- backoffLimit: 12
- template:
- metadata:
- labels:
- app: {{ template "nem-att.name" . }}
- release: {{ .Release.Name }}
- annotations:
- checksum/config: {{ include (print $.Template.BasePath "/tosca-configmap.yaml") . | sha256sum }}
- spec:
- restartPolicy: OnFailure
- containers:
- - name: {{ .Chart.Name }}-tosca-loader
- image: {{ tpl .Values.tosca_loaderImage . | quote }}
- imagePullPolicy: {{ .Values.imagePullPolicy }}
- env:
- - name: XOS_USER
- value: {{ .Values.xosAdminUser }}
- - name: XOS_PASSWD
- valueFrom:
- secretKeyRef:
- name: xos-admin-passwd-secret
- key: password
- volumeMounts:
- - name: nem-att-tosca
- mountPath: /opt/tosca
- volumes:
- - name: nem-att-tosca
- configMap:
- name: nem-att-tosca
diff --git a/helm-charts/profile/nem-att/values.yaml b/helm-charts/profile/nem-att/values.yaml
deleted file mode 100644
index be7e280..0000000
--- a/helm-charts/profile/nem-att/values.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-#
-# 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.
-
-# Default values for the nem-att profile.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-nameOverride: ""
-fullnameOverride: ""
-
-imagePullPolicy: 'Always'
-
-tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
-
-xos_api_testerImage: 'xosproject/xos-api-tester:2.0.1'
-
-xosAdminUser: "admin@opencord.org"
-xosAdminPassword: "letmein"
-
-onosFabricRestService: "onos-fabric-ui.default.svc.cluster.local"
-onosVolthaRestService: "onos-voltha-ui.default.svc.cluster.local"
-kafkaService: "nem-core-kafka.default.svc.cluster.local:9092"
-
-volt:
- kafkaService: "nem-core-kafka.default.svc.cluster.local"
-hippie-oss:
- kafkaService: "nem-core-kafka.default.svc.cluster.local"
-
-# onos-voltha applications
-cordConfigAppUrl: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/cord-config/1.4.0/cord-config-1.4.0.oar"
-oltAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=olt-app&v=2.0.0-SNAPSHOT&e=oar"
-sadisAppUrl: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/sadis-app/2.1.0/sadis-app-2.1.0.oar"
-dhcpl2relayAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=dhcpl2relay&v=1.5.0-SNAPSHOT&e=oar"
-aaaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=aaa&v=1.8.0-SNAPSHOT&e=oar"
-kafkaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=kafka&v=1.0.0-SNAPSHOT&e=oar"
diff --git a/helm-charts/seba-substrate/.helmignore b/helm-charts/seba-substrate/.helmignore
deleted file mode 100644
index f0c1319..0000000
--- a/helm-charts/seba-substrate/.helmignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
diff --git a/helm-charts/seba-substrate/requirements.yaml b/helm-charts/seba-substrate/requirements.yaml
deleted file mode 100644
index 4bc335c..0000000
--- a/helm-charts/seba-substrate/requirements.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# 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.
-
-dependencies:
-
-- name: voltha
- version: 1.0.0
- repository: https://charts.opencord.org/master/
-
-- name: onos
- alias: onos-voltha
- version: 0.1.0
- repository: https://charts.opencord.org/master/
-
-- name: onos
- alias: onos-fabric
- version: 0.1.0
- repository: https://charts.opencord.org/master/
-
-- name: kafka
- alias: voltha-kafka
- version: 0.4.7
- repository: https://kubernetes-charts-incubator.storage.googleapis.com/
diff --git a/helm-charts/seba-substrate/templates/NOTES.txt b/helm-charts/seba-substrate/templates/NOTES.txt
deleted file mode 100644
index cb50ff5..0000000
--- a/helm-charts/seba-substrate/templates/NOTES.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Thank you for installing {{ .Chart.Name }}.
-
-Your release is named {{ .Release.Name }}.
-
diff --git a/helm-charts/seba-substrate/values.yaml b/helm-charts/seba-substrate/values.yaml
deleted file mode 100644
index 50bbdb3..0000000
--- a/helm-charts/seba-substrate/values.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# 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.
-
-# Aggregation chart of SEBA charts
-
-# configuration for kafka
-voltha-kafka:
- replicas: 1
- persistence:
- enabled: false
- zookeeper:
- servers: 1
- persistence:
- enabled: false
-
-voltha:
- etcd-operator:
- customResources:
- createEtcdClusterCRD: true
- kafkaReleaseName: "seba-substrate-voltha-kafka"
-
-# from configs/onos-voltha.yaml
-onos-voltha:
- nameOverride: "onosv"
- fullnameOverride: "onos-voltha"
-
- services:
- openflowServiceType: ClusterIP
- ovsdbServiceType: ClusterIP
- sshServiceType: NodePort
- uiServiceType: NodePort
- ssh:
- nodePort: 30115
- ui:
- nodePort: 30120
-
- onos_env:
- - name: POD_IP
- valueFrom:
- fieldRef:
- fieldPath: status.podIP
- - name: NAMESPACE
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
- - name: ONOS_APPS
- value: "drivers,openflow-base"
-
-
-# from configs/onos-fabric.yaml
-onos-fabric:
- nameOverride: "onosf"
- fullnameOverride: "onos-fabric"
-
- services:
- openflowServiceType: NodePort
- ovsdbServiceType: NodePort
- sshServiceType: NodePort
- uiServiceType: NodePort
- ovsdb:
- nodePort: 31640
- openflow:
- nodePort: 31653
- ssh:
- nodePort: 31101
- ui:
- nodePort: 31181
-
- onos_env:
- - name: ONOS_APPS
- value: "openflow"
diff --git a/helm-charts/seba-substrate/Chart.yaml b/seba/Chart.yaml
similarity index 77%
rename from helm-charts/seba-substrate/Chart.yaml
rename to seba/Chart.yaml
index c0e22e8..7eb5828 100644
--- a/helm-charts/seba-substrate/Chart.yaml
+++ b/seba/Chart.yaml
@@ -1,4 +1,3 @@
----
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
-name: seba-substrate
-description: A Helm chart for setting up VOLTHA, ONOS, and Kafka
-version: 0.1.0
+name: seba
+description: A Helm chart to install the SEBA profile on top of the CORD platform
+icon: https://guide.opencord.org/logos/cord.svg
+version: 1.0.0
+appVersion: 1.0.0
diff --git a/helm-charts/nem-core/requirements.yaml b/seba/requirements.yaml
similarity index 61%
rename from helm-charts/nem-core/requirements.yaml
rename to seba/requirements.yaml
index be454e2..74ec561 100644
--- a/helm-charts/nem-core/requirements.yaml
+++ b/seba/requirements.yaml
@@ -14,12 +14,16 @@
# limitations under the License.
dependencies:
-
-- name: xos-core
- version: 2.0.0
- repository: https://charts.opencord.org/master/
-
-- name: kafka
- alias: kafka
- version: 0.4.7
- repository: https://kubernetes-charts-incubator.storage.googleapis.com/
+- name: stable/etcd-operator
+ version: 0.8.0
+ repository: https://kubernetes-charts.storage.googleapis.com
+ condition: etcd-operator.enabled
+- name: voltha
+ version: 1.0.2
+ repository: https://charts.opencord.org
+- name: seba-services
+ version: 1.0.1
+ repository: https://charts.opencord.org
+- name: base-kubernetes
+ version: 1.0.1
+ repository: https://charts.opencord.org
diff --git a/seba/templates/.gitignore b/seba/templates/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/seba/templates/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/helm-charts/nem-core/Chart.yaml b/seba/values.yaml
similarity index 85%
rename from helm-charts/nem-core/Chart.yaml
rename to seba/values.yaml
index d23be31..d255bf2 100644
--- a/helm-charts/nem-core/Chart.yaml
+++ b/seba/values.yaml
@@ -12,9 +12,3 @@
# 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.
-
-apiVersion: v1
-name: nem-core
-description: A Helm chart that installs the NEM core
-version: 0.1.0
-
diff --git a/tools/wait-for-pods.sh b/tools/wait-for-pods.sh
deleted file mode 100755
index f6ea657..0000000
--- a/tools/wait-for-pods.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-# Copyright 2017 The Openstack-Helm Authors.
-#
-# 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.
-set -e
-
-# From Kolla-Kubernetes, orginal authors Kevin Fox & Serguei Bezverkhi
-# Default wait timeout is 600 seconds
-end=$(date +%s)
-if ! [ -z $2 ]; then
- end=$((end + $2))
-else
- end=$((end + 900))
-fi
-while true; do
- kubectl get pods --namespace=$1 -o json | jq -r \
- '.items[].status.phase' | grep Pending > /dev/null && \
- PENDING=True || PENDING=False
- query='.items[]|select(.status.phase=="Running")'
- query="$query|.status.containerStatuses[].ready"
- kubectl get pods --namespace=$1 -o json | jq -r "$query" | \
- grep false > /dev/null && READY="False" || READY="True"
- kubectl get jobs -o json --namespace=$1 | jq -r \
- '.items[] | .spec.completions == .status.succeeded' | \
- grep false > /dev/null && JOBR="False" || JOBR="True"
- [ $PENDING == "False" -a $READY == "True" -a $JOBR == "True" ] && \
- break || true
- sleep 5
- now=$(date +%s)
- [ $now -gt $end ] && echo containers failed to start. && \
- kubectl get pods --namespace $1 -o wide && exit -1
-done