From 938bce7370e5270ccce30cb864f528040c6d1f1a Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Sun, 17 Dec 2017 15:49:51 -0600 Subject: [PATCH] Include prometheus- prefix for select monitoring charts This adds the prometheus- prefix to the alertmanager, kube-state-metrics and node exporter charts to reflect their intended usage as part of a prometheus centric monitoring solution This will imply a logical grouping of these components, similar to their deployment in the osh-infra gates Change-Id: I4f391a10b64389022f01a94ea3704c110f8f9bb5 --- .../Chart.yaml | 4 ++-- .../requirements.yaml | 0 .../templates/bin/_alertmanager.sh.tpl | 0 .../templates/clusterrolebinding.yaml | 0 .../templates/configmap-bin.yaml | 0 .../templates/configmap-etc.yaml | 0 .../templates/ingress-alertmanager.yaml | 0 .../templates/job-image-repo-sync.yaml | 0 .../templates/pvc.yaml | 0 .../templates/rbac-entrypoint.yaml | 0 .../service-ingress-alertmanager.yaml | 0 .../templates/service.yaml | 0 .../templates/serviceaccount.yaml | 0 .../templates/statefulset.yaml | 0 .../values.yaml | 0 .../Chart.yaml | 4 ++-- .../requirements.yaml | 0 .../templates/clusterrole.yaml | 0 .../templates/clusterrolebinding.yaml | 0 .../templates/configmap-bin.yaml | 0 .../templates/deployment.yaml | 0 .../templates/job-image-repo-sync.yaml | 0 .../templates/rbac-entrypoint.yaml | 0 .../templates/service-controller-manager.yaml | 0 .../templates/service-kube-metrics.yaml | 0 .../templates/service-scheduler.yaml | 0 .../templates/serviceaccount.yaml | 0 .../values.yaml | 0 .../Chart.yaml | 4 ++-- .../requirements.yaml | 0 .../templates/clusterrolebinding.yaml | 0 .../templates/configmap-bin.yaml | 0 .../templates/daemonset.yaml | 0 .../templates/job-image-repo-sync.yaml | 0 .../templates/rbac-entrypoint.yaml | 0 .../templates/service.yaml | 0 .../templates/serviceaccount.yaml | 0 .../values.yaml | 0 tools/gate/chart-deploys/default.yaml | 18 +++++++++--------- 39 files changed, 15 insertions(+), 15 deletions(-) rename {alertmanager => prometheus-alertmanager}/Chart.yaml (90%) rename {alertmanager => prometheus-alertmanager}/requirements.yaml (100%) rename {alertmanager => prometheus-alertmanager}/templates/bin/_alertmanager.sh.tpl (100%) rename {alertmanager => prometheus-alertmanager}/templates/clusterrolebinding.yaml (100%) rename {alertmanager => prometheus-alertmanager}/templates/configmap-bin.yaml (100%) rename {alertmanager => prometheus-alertmanager}/templates/configmap-etc.yaml (100%) rename {alertmanager => prometheus-alertmanager}/templates/ingress-alertmanager.yaml (100%) rename {alertmanager => prometheus-alertmanager}/templates/job-image-repo-sync.yaml (100%) rename {alertmanager => prometheus-alertmanager}/templates/pvc.yaml (100%) rename {alertmanager => prometheus-alertmanager}/templates/rbac-entrypoint.yaml (100%) rename {alertmanager => prometheus-alertmanager}/templates/service-ingress-alertmanager.yaml (100%) rename {alertmanager => prometheus-alertmanager}/templates/service.yaml (100%) rename {alertmanager => prometheus-alertmanager}/templates/serviceaccount.yaml (100%) rename {alertmanager => prometheus-alertmanager}/templates/statefulset.yaml (100%) rename {alertmanager => prometheus-alertmanager}/values.yaml (100%) rename {kube-state-metrics => prometheus-kube-state-metrics}/Chart.yaml (89%) rename {kube-state-metrics => prometheus-kube-state-metrics}/requirements.yaml (100%) rename {kube-state-metrics => prometheus-kube-state-metrics}/templates/clusterrole.yaml (100%) rename {kube-state-metrics => prometheus-kube-state-metrics}/templates/clusterrolebinding.yaml (100%) rename {kube-state-metrics => prometheus-kube-state-metrics}/templates/configmap-bin.yaml (100%) rename {kube-state-metrics => prometheus-kube-state-metrics}/templates/deployment.yaml (100%) rename {kube-state-metrics => prometheus-kube-state-metrics}/templates/job-image-repo-sync.yaml (100%) rename {kube-state-metrics => prometheus-kube-state-metrics}/templates/rbac-entrypoint.yaml (100%) rename {kube-state-metrics => prometheus-kube-state-metrics}/templates/service-controller-manager.yaml (100%) rename {kube-state-metrics => prometheus-kube-state-metrics}/templates/service-kube-metrics.yaml (100%) rename {kube-state-metrics => prometheus-kube-state-metrics}/templates/service-scheduler.yaml (100%) rename {kube-state-metrics => prometheus-kube-state-metrics}/templates/serviceaccount.yaml (100%) rename {kube-state-metrics => prometheus-kube-state-metrics}/values.yaml (100%) rename {node-exporter => prometheus-node-exporter}/Chart.yaml (90%) rename {node-exporter => prometheus-node-exporter}/requirements.yaml (100%) rename {node-exporter => prometheus-node-exporter}/templates/clusterrolebinding.yaml (100%) rename {node-exporter => prometheus-node-exporter}/templates/configmap-bin.yaml (100%) rename {node-exporter => prometheus-node-exporter}/templates/daemonset.yaml (100%) rename {node-exporter => prometheus-node-exporter}/templates/job-image-repo-sync.yaml (100%) rename {node-exporter => prometheus-node-exporter}/templates/rbac-entrypoint.yaml (100%) rename {node-exporter => prometheus-node-exporter}/templates/service.yaml (100%) rename {node-exporter => prometheus-node-exporter}/templates/serviceaccount.yaml (100%) rename {node-exporter => prometheus-node-exporter}/values.yaml (100%) diff --git a/alertmanager/Chart.yaml b/prometheus-alertmanager/Chart.yaml similarity index 90% rename from alertmanager/Chart.yaml rename to prometheus-alertmanager/Chart.yaml index dc3f51f82..31837377d 100644 --- a/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: diff --git a/alertmanager/requirements.yaml b/prometheus-alertmanager/requirements.yaml similarity index 100% rename from alertmanager/requirements.yaml rename to prometheus-alertmanager/requirements.yaml diff --git a/alertmanager/templates/bin/_alertmanager.sh.tpl b/prometheus-alertmanager/templates/bin/_alertmanager.sh.tpl similarity index 100% rename from alertmanager/templates/bin/_alertmanager.sh.tpl rename to prometheus-alertmanager/templates/bin/_alertmanager.sh.tpl diff --git a/alertmanager/templates/clusterrolebinding.yaml b/prometheus-alertmanager/templates/clusterrolebinding.yaml similarity index 100% rename from alertmanager/templates/clusterrolebinding.yaml rename to prometheus-alertmanager/templates/clusterrolebinding.yaml diff --git a/alertmanager/templates/configmap-bin.yaml b/prometheus-alertmanager/templates/configmap-bin.yaml similarity index 100% rename from alertmanager/templates/configmap-bin.yaml rename to prometheus-alertmanager/templates/configmap-bin.yaml diff --git a/alertmanager/templates/configmap-etc.yaml b/prometheus-alertmanager/templates/configmap-etc.yaml similarity index 100% rename from alertmanager/templates/configmap-etc.yaml rename to prometheus-alertmanager/templates/configmap-etc.yaml diff --git a/alertmanager/templates/ingress-alertmanager.yaml b/prometheus-alertmanager/templates/ingress-alertmanager.yaml similarity index 100% rename from alertmanager/templates/ingress-alertmanager.yaml rename to prometheus-alertmanager/templates/ingress-alertmanager.yaml diff --git a/alertmanager/templates/job-image-repo-sync.yaml b/prometheus-alertmanager/templates/job-image-repo-sync.yaml similarity index 100% rename from alertmanager/templates/job-image-repo-sync.yaml rename to prometheus-alertmanager/templates/job-image-repo-sync.yaml diff --git a/alertmanager/templates/pvc.yaml b/prometheus-alertmanager/templates/pvc.yaml similarity index 100% rename from alertmanager/templates/pvc.yaml rename to prometheus-alertmanager/templates/pvc.yaml diff --git a/alertmanager/templates/rbac-entrypoint.yaml b/prometheus-alertmanager/templates/rbac-entrypoint.yaml similarity index 100% rename from alertmanager/templates/rbac-entrypoint.yaml rename to prometheus-alertmanager/templates/rbac-entrypoint.yaml diff --git a/alertmanager/templates/service-ingress-alertmanager.yaml b/prometheus-alertmanager/templates/service-ingress-alertmanager.yaml similarity index 100% rename from alertmanager/templates/service-ingress-alertmanager.yaml rename to prometheus-alertmanager/templates/service-ingress-alertmanager.yaml diff --git a/alertmanager/templates/service.yaml b/prometheus-alertmanager/templates/service.yaml similarity index 100% rename from alertmanager/templates/service.yaml rename to prometheus-alertmanager/templates/service.yaml diff --git a/alertmanager/templates/serviceaccount.yaml b/prometheus-alertmanager/templates/serviceaccount.yaml similarity index 100% rename from alertmanager/templates/serviceaccount.yaml rename to prometheus-alertmanager/templates/serviceaccount.yaml diff --git a/alertmanager/templates/statefulset.yaml b/prometheus-alertmanager/templates/statefulset.yaml similarity index 100% rename from alertmanager/templates/statefulset.yaml rename to prometheus-alertmanager/templates/statefulset.yaml diff --git a/alertmanager/values.yaml b/prometheus-alertmanager/values.yaml similarity index 100% rename from alertmanager/values.yaml rename to prometheus-alertmanager/values.yaml diff --git a/kube-state-metrics/Chart.yaml b/prometheus-kube-state-metrics/Chart.yaml similarity index 89% rename from kube-state-metrics/Chart.yaml rename to prometheus-kube-state-metrics/Chart.yaml index 008c05d5a..19a63e05d 100644 --- a/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: diff --git a/kube-state-metrics/requirements.yaml b/prometheus-kube-state-metrics/requirements.yaml similarity index 100% rename from kube-state-metrics/requirements.yaml rename to prometheus-kube-state-metrics/requirements.yaml diff --git a/kube-state-metrics/templates/clusterrole.yaml b/prometheus-kube-state-metrics/templates/clusterrole.yaml similarity index 100% rename from kube-state-metrics/templates/clusterrole.yaml rename to prometheus-kube-state-metrics/templates/clusterrole.yaml diff --git a/kube-state-metrics/templates/clusterrolebinding.yaml b/prometheus-kube-state-metrics/templates/clusterrolebinding.yaml similarity index 100% rename from kube-state-metrics/templates/clusterrolebinding.yaml rename to prometheus-kube-state-metrics/templates/clusterrolebinding.yaml diff --git a/kube-state-metrics/templates/configmap-bin.yaml b/prometheus-kube-state-metrics/templates/configmap-bin.yaml similarity index 100% rename from kube-state-metrics/templates/configmap-bin.yaml rename to prometheus-kube-state-metrics/templates/configmap-bin.yaml diff --git a/kube-state-metrics/templates/deployment.yaml b/prometheus-kube-state-metrics/templates/deployment.yaml similarity index 100% rename from kube-state-metrics/templates/deployment.yaml rename to prometheus-kube-state-metrics/templates/deployment.yaml diff --git a/kube-state-metrics/templates/job-image-repo-sync.yaml b/prometheus-kube-state-metrics/templates/job-image-repo-sync.yaml similarity index 100% rename from kube-state-metrics/templates/job-image-repo-sync.yaml rename to prometheus-kube-state-metrics/templates/job-image-repo-sync.yaml diff --git a/kube-state-metrics/templates/rbac-entrypoint.yaml b/prometheus-kube-state-metrics/templates/rbac-entrypoint.yaml similarity index 100% rename from kube-state-metrics/templates/rbac-entrypoint.yaml rename to prometheus-kube-state-metrics/templates/rbac-entrypoint.yaml diff --git a/kube-state-metrics/templates/service-controller-manager.yaml b/prometheus-kube-state-metrics/templates/service-controller-manager.yaml similarity index 100% rename from kube-state-metrics/templates/service-controller-manager.yaml rename to prometheus-kube-state-metrics/templates/service-controller-manager.yaml diff --git a/kube-state-metrics/templates/service-kube-metrics.yaml b/prometheus-kube-state-metrics/templates/service-kube-metrics.yaml similarity index 100% rename from kube-state-metrics/templates/service-kube-metrics.yaml rename to prometheus-kube-state-metrics/templates/service-kube-metrics.yaml diff --git a/kube-state-metrics/templates/service-scheduler.yaml b/prometheus-kube-state-metrics/templates/service-scheduler.yaml similarity index 100% rename from kube-state-metrics/templates/service-scheduler.yaml rename to prometheus-kube-state-metrics/templates/service-scheduler.yaml diff --git a/kube-state-metrics/templates/serviceaccount.yaml b/prometheus-kube-state-metrics/templates/serviceaccount.yaml similarity index 100% rename from kube-state-metrics/templates/serviceaccount.yaml rename to prometheus-kube-state-metrics/templates/serviceaccount.yaml diff --git a/kube-state-metrics/values.yaml b/prometheus-kube-state-metrics/values.yaml similarity index 100% rename from kube-state-metrics/values.yaml rename to prometheus-kube-state-metrics/values.yaml diff --git a/node-exporter/Chart.yaml b/prometheus-node-exporter/Chart.yaml similarity index 90% rename from node-exporter/Chart.yaml rename to prometheus-node-exporter/Chart.yaml index 202cd4c54..645597bbd 100644 --- a/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: diff --git a/node-exporter/requirements.yaml b/prometheus-node-exporter/requirements.yaml similarity index 100% rename from node-exporter/requirements.yaml rename to prometheus-node-exporter/requirements.yaml diff --git a/node-exporter/templates/clusterrolebinding.yaml b/prometheus-node-exporter/templates/clusterrolebinding.yaml similarity index 100% rename from node-exporter/templates/clusterrolebinding.yaml rename to prometheus-node-exporter/templates/clusterrolebinding.yaml diff --git a/node-exporter/templates/configmap-bin.yaml b/prometheus-node-exporter/templates/configmap-bin.yaml similarity index 100% rename from node-exporter/templates/configmap-bin.yaml rename to prometheus-node-exporter/templates/configmap-bin.yaml diff --git a/node-exporter/templates/daemonset.yaml b/prometheus-node-exporter/templates/daemonset.yaml similarity index 100% rename from node-exporter/templates/daemonset.yaml rename to prometheus-node-exporter/templates/daemonset.yaml diff --git a/node-exporter/templates/job-image-repo-sync.yaml b/prometheus-node-exporter/templates/job-image-repo-sync.yaml similarity index 100% rename from node-exporter/templates/job-image-repo-sync.yaml rename to prometheus-node-exporter/templates/job-image-repo-sync.yaml diff --git a/node-exporter/templates/rbac-entrypoint.yaml b/prometheus-node-exporter/templates/rbac-entrypoint.yaml similarity index 100% rename from node-exporter/templates/rbac-entrypoint.yaml rename to prometheus-node-exporter/templates/rbac-entrypoint.yaml diff --git a/node-exporter/templates/service.yaml b/prometheus-node-exporter/templates/service.yaml similarity index 100% rename from node-exporter/templates/service.yaml rename to prometheus-node-exporter/templates/service.yaml diff --git a/node-exporter/templates/serviceaccount.yaml b/prometheus-node-exporter/templates/serviceaccount.yaml similarity index 100% rename from node-exporter/templates/serviceaccount.yaml rename to prometheus-node-exporter/templates/serviceaccount.yaml diff --git a/node-exporter/values.yaml b/prometheus-node-exporter/values.yaml similarity index 100% rename from node-exporter/values.yaml rename to prometheus-node-exporter/values.yaml diff --git a/tools/gate/chart-deploys/default.yaml b/tools/gate/chart-deploys/default.yaml index c356ae310..e7ab30f87 100644 --- 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: