Merge "Include prometheus- prefix for select monitoring charts"

2017-12-18 15:51:38 +00:00 · 2017-12-18 15:51:38 +00:00 · 4c9383b216
commit 4c9383b216
parent fd9cde08f5 938bce7370
39 changed files with 15 additions and 15 deletions
--- a/prometheus-alertmanager/Chart.yaml
+++ b/prometheus-alertmanager/Chart.yaml
@ -13,8 +13,8 @@
 # limitations under the License.

 apiVersion: v1
-description: OpenStack-Helm Alertmanager
-name: alertmanager
+description: OpenStack-Helm Alertmanager for Prometheus
+name: prometheus-alertmanager
 version: 0.1.0
 home: https://prometheus.io/docs/alerting/alertmanager/
 sources:
--- a/prometheus-alertmanager/requirements.yaml
+++ b/prometheus-alertmanager/requirements.yaml
--- a/prometheus-alertmanager/templates/bin/_alertmanager.sh.tpl
+++ b/prometheus-alertmanager/templates/bin/_alertmanager.sh.tpl
--- a/prometheus-alertmanager/templates/clusterrolebinding.yaml
+++ b/prometheus-alertmanager/templates/clusterrolebinding.yaml
--- a/prometheus-alertmanager/templates/configmap-bin.yaml
+++ b/prometheus-alertmanager/templates/configmap-bin.yaml
--- a/prometheus-alertmanager/templates/configmap-etc.yaml
+++ b/prometheus-alertmanager/templates/configmap-etc.yaml
--- a/prometheus-alertmanager/templates/ingress-alertmanager.yaml
+++ b/prometheus-alertmanager/templates/ingress-alertmanager.yaml
--- a/prometheus-alertmanager/templates/job-image-repo-sync.yaml
+++ b/prometheus-alertmanager/templates/job-image-repo-sync.yaml
--- a/prometheus-alertmanager/templates/pvc.yaml
+++ b/prometheus-alertmanager/templates/pvc.yaml
--- a/prometheus-alertmanager/templates/rbac-entrypoint.yaml
+++ b/prometheus-alertmanager/templates/rbac-entrypoint.yaml
--- a/prometheus-alertmanager/templates/service-ingress-alertmanager.yaml
+++ b/prometheus-alertmanager/templates/service-ingress-alertmanager.yaml
--- a/prometheus-alertmanager/templates/service.yaml
+++ b/prometheus-alertmanager/templates/service.yaml
--- a/prometheus-alertmanager/templates/serviceaccount.yaml
+++ b/prometheus-alertmanager/templates/serviceaccount.yaml
--- a/prometheus-alertmanager/templates/statefulset.yaml
+++ b/prometheus-alertmanager/templates/statefulset.yaml
--- a/prometheus-alertmanager/values.yaml
+++ b/prometheus-alertmanager/values.yaml
--- a/prometheus-kube-state-metrics/Chart.yaml
+++ b/prometheus-kube-state-metrics/Chart.yaml
@ -13,8 +13,8 @@
 # limitations under the License.

 apiVersion: v1
-description: OpenStack-Helm Kube-State-Metrics
-name: kube-state-metrics
+description: OpenStack-Helm Kube-State-Metrics for Prometheus
+name: prometheus-kube-state-metrics
 version: 0.1.0
 home: https://github.com/kubernetes/kube-state-metrics
 sources:
--- a/prometheus-kube-state-metrics/requirements.yaml
+++ b/prometheus-kube-state-metrics/requirements.yaml
--- a/prometheus-kube-state-metrics/templates/clusterrole.yaml
+++ b/prometheus-kube-state-metrics/templates/clusterrole.yaml
--- a/prometheus-kube-state-metrics/templates/clusterrolebinding.yaml
+++ b/prometheus-kube-state-metrics/templates/clusterrolebinding.yaml
--- a/prometheus-kube-state-metrics/templates/configmap-bin.yaml
+++ b/prometheus-kube-state-metrics/templates/configmap-bin.yaml
--- a/prometheus-kube-state-metrics/templates/deployment.yaml
+++ b/prometheus-kube-state-metrics/templates/deployment.yaml
--- a/prometheus-kube-state-metrics/templates/job-image-repo-sync.yaml
+++ b/prometheus-kube-state-metrics/templates/job-image-repo-sync.yaml
--- a/prometheus-kube-state-metrics/templates/rbac-entrypoint.yaml
+++ b/prometheus-kube-state-metrics/templates/rbac-entrypoint.yaml
--- a/prometheus-kube-state-metrics/templates/service-controller-manager.yaml
+++ b/prometheus-kube-state-metrics/templates/service-controller-manager.yaml
--- a/prometheus-kube-state-metrics/templates/service-kube-metrics.yaml
+++ b/prometheus-kube-state-metrics/templates/service-kube-metrics.yaml
--- a/prometheus-kube-state-metrics/templates/service-scheduler.yaml
+++ b/prometheus-kube-state-metrics/templates/service-scheduler.yaml
--- a/prometheus-kube-state-metrics/templates/serviceaccount.yaml
+++ b/prometheus-kube-state-metrics/templates/serviceaccount.yaml
--- a/prometheus-kube-state-metrics/values.yaml
+++ b/prometheus-kube-state-metrics/values.yaml
--- a/prometheus-node-exporter/Chart.yaml
+++ b/prometheus-node-exporter/Chart.yaml
@ -13,8 +13,8 @@
 # limitations under the License.

 apiVersion: v1
-description: OpenStack-Helm Node Exporter
-name: node-exporter
+description: OpenStack-Helm Node Exporter for Prometheus
+name: prometheus-node-exporter
 version: 0.1.0
 home: https://github.com/prometheus/node_exporter
 sources:
--- a/prometheus-node-exporter/requirements.yaml
+++ b/prometheus-node-exporter/requirements.yaml
--- a/prometheus-node-exporter/templates/clusterrolebinding.yaml
+++ b/prometheus-node-exporter/templates/clusterrolebinding.yaml
--- a/prometheus-node-exporter/templates/configmap-bin.yaml
+++ b/prometheus-node-exporter/templates/configmap-bin.yaml
--- a/prometheus-node-exporter/templates/daemonset.yaml
+++ b/prometheus-node-exporter/templates/daemonset.yaml
--- a/prometheus-node-exporter/templates/job-image-repo-sync.yaml
+++ b/prometheus-node-exporter/templates/job-image-repo-sync.yaml
--- a/prometheus-node-exporter/templates/rbac-entrypoint.yaml
+++ b/prometheus-node-exporter/templates/rbac-entrypoint.yaml
--- a/prometheus-node-exporter/templates/service.yaml
+++ b/prometheus-node-exporter/templates/service.yaml
--- a/prometheus-node-exporter/templates/serviceaccount.yaml
+++ b/prometheus-node-exporter/templates/serviceaccount.yaml
--- a/prometheus-node-exporter/values.yaml
+++ b/prometheus-node-exporter/values.yaml
--- a/tools/gate/chart-deploys/default.yaml
+++ b/tools/gate/chart-deploys/default.yaml
@ -24,9 +24,9 @@ chart_groups:
    timeout: 600
    charts:
      - prometheus
-      - node_exporter
-      - kube_state_metrics
-      - alertmanager
+      - prometheus_node_exporter
+      - prometheus_kube_state_metrics
+      - prometheus_alertmanager

  - name: openstack_infra_logging
    timeout: 600
@ -93,8 +93,8 @@ charts:
          ingress:
            public: false

-  kube_state_metrics:
-    chart_name: kube-state-metrics
+  prometheus_kube_state_metrics:
+    chart_name: prometheus-kube-state-metrics
    release: prometheus-kube-metrics
    namespace: kube-system
    test:
@ -102,8 +102,8 @@ charts:
      timeout: 300
      output: false

-  node_exporter:
-    chart_name: node-exporter
+  prometheus_node_exporter:
+    chart_name: prometheus-node-exporter
    release: prometheus-node-exporter
    namespace: kube-system
    test:
@ -111,8 +111,8 @@ charts:
      timeout: 300
      output: false

-  alertmanager:
-    chart_name: alertmanager
+  prometheus_alertmanager:
+    chart_name: prometheus-alertmanager
    release: prometheus-alertmanager
    namespace: openstack
    test: