Merge branch 'main' into rename-prometheus-operator-kube-prometheus

prometheus-community · Sep 9, 2020 · 5a8c3aa · 5a8c3aa
2 parents cb157fb + 80d1ed0
commit 5a8c3aa
Show file tree

Hide file tree

Showing 49 changed files with 5 additions and 3 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -17,7 +17,7 @@
 /charts/prometheus-mysql-exporter @juanchimienti @monotek
 /charts/prometheus-nats-exporter @okgolove @caarlos0
 /charts/prometheus-node-exporter @gianrubio @vsliouniaev
-/charts/prometheus-postgres-exporter @gianrubio
+/charts/prometheus-postgres-exporter @gianrubio @zanhsieh
 /charts/prometheus-pushgateway @gianrubio @cstaud
 /charts/prometheus-rabbitmq-exporter @juanchimienti
 /charts/prometheus-redis-exporter @acondrat @zanhsieh

diff --git a/charts/prometheus-postgres-exporter/Chart.yaml b/charts/prometheus-postgres-exporter/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.8.0"
 description: A Helm chart for prometheus postgres-exporter
 name: prometheus-postgres-exporter
-version: 1.3.1
+version: 1.3.2
 home: https://github.com/wrouesnel/postgres_exporter
 sources:
 - https://github.com/wrouesnel/postgres_exporter
@@ -13,3 +13,5 @@ keywords:
 maintainers:
 - email: [email protected]
   name: gianrubio
+- email: [email protected]
+  name: zanhsieh
diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: prometheus
-version: 11.14.1
+version: 11.15.0
 appVersion: 2.20.1
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/

diff --git a/...plates/rbac/alertmanager-clusterrole.yaml → ...s/templates/alertmanager/clusterrole.yaml b/...plates/rbac/alertmanager-clusterrole.yaml → ...s/templates/alertmanager/clusterrole.yaml
diff --git a/...rbac/alertmanager-clusterrolebinding.yaml → ...ates/alertmanager/clusterrolebinding.yaml b/...rbac/alertmanager-clusterrolebinding.yaml → ...ates/alertmanager/clusterrolebinding.yaml
diff --git a/...us/templates/configmaps/alertmanager.yaml → ...prometheus/templates/alertmanager/cm.yaml b/...us/templates/configmaps/alertmanager.yaml → ...prometheus/templates/alertmanager/cm.yaml
diff --git a/...s/templates/deployments/alertmanager.yaml → ...etheus/templates/alertmanager/deploy.yaml b/...s/templates/deployments/alertmanager.yaml → ...etheus/templates/alertmanager/deploy.yaml
diff --git a/...lates/services/alertmanager-headless.yaml → .../templates/alertmanager/headless-svc.yaml b/...lates/services/alertmanager-headless.yaml → .../templates/alertmanager/headless-svc.yaml
diff --git a/...eus/templates/ingresses/alertmanager.yaml → ...theus/templates/alertmanager/ingress.yaml b/...eus/templates/ingresses/alertmanager.yaml → ...theus/templates/alertmanager/ingress.yaml
diff --git a/...mplates/networkpolicies/alertmanager.yaml → ...etheus/templates/alertmanager/netpol.yaml b/...mplates/networkpolicies/alertmanager.yaml → ...etheus/templates/alertmanager/netpol.yaml
diff --git a/...es/poddisruptionbudgets/alertmanager.yaml → ...rometheus/templates/alertmanager/pdb.yaml b/...es/poddisruptionbudgets/alertmanager.yaml → ...rometheus/templates/alertmanager/pdb.yaml
diff --git a/...tes/podsecuritypolicies/alertmanager.yaml → ...rometheus/templates/alertmanager/psp.yaml b/...tes/podsecuritypolicies/alertmanager.yaml → ...rometheus/templates/alertmanager/psp.yaml
diff --git a/.../persistentvolumeclaims/alertmanager.yaml → ...rometheus/templates/alertmanager/pvc.yaml b/.../persistentvolumeclaims/alertmanager.yaml → ...rometheus/templates/alertmanager/pvc.yaml
diff --git a/...eus/templates/rbac/alertmanager-role.yaml → ...ometheus/templates/alertmanager/role.yaml b/...eus/templates/rbac/alertmanager-role.yaml → ...ometheus/templates/alertmanager/role.yaml
diff --git a/...plates/rbac/alertmanager-rolebinding.yaml → ...s/templates/alertmanager/rolebinding.yaml b/...plates/rbac/alertmanager-rolebinding.yaml → ...s/templates/alertmanager/rolebinding.yaml
diff --git a/...heus/templates/services/alertmanager.yaml → ...theus/templates/alertmanager/service.yaml b/...heus/templates/services/alertmanager.yaml → ...theus/templates/alertmanager/service.yaml
diff --git a/...tes/rbac/alertmanager-serviceaccount.yaml → ...emplates/alertmanager/serviceaccount.yaml b/...tes/rbac/alertmanager-serviceaccount.yaml → ...emplates/alertmanager/serviceaccount.yaml
diff --git a/.../templates/statefulsets/alertmanager.yaml → ...rometheus/templates/alertmanager/sts.yaml b/.../templates/statefulsets/alertmanager.yaml → ...rometheus/templates/alertmanager/sts.yaml
diff --git a/...s/templates/daemonsets/node-exporter.yaml → ...us/templates/node-exporter/daemonset.yaml b/...s/templates/daemonsets/node-exporter.yaml → ...us/templates/node-exporter/daemonset.yaml
diff --git a/...es/podsecuritypolicies/node-exporter.yaml → ...ometheus/templates/node-exporter/psp.yaml b/...es/podsecuritypolicies/node-exporter.yaml → ...ometheus/templates/node-exporter/psp.yaml
diff --git a/...us/templates/rbac/node-exporter-role.yaml → ...metheus/templates/node-exporter/role.yaml b/...us/templates/rbac/node-exporter-role.yaml → ...metheus/templates/node-exporter/role.yaml
diff --git a/...lates/rbac/node-exporter-rolebinding.yaml → .../templates/node-exporter/rolebinding.yaml b/...lates/rbac/node-exporter-rolebinding.yaml → .../templates/node-exporter/rolebinding.yaml
diff --git a/...es/rbac/node-exporter-serviceaccount.yaml → ...mplates/node-exporter/serviceaccount.yaml b/...es/rbac/node-exporter-serviceaccount.yaml → ...mplates/node-exporter/serviceaccount.yaml
diff --git a/...eus/templates/services/node-exporter.yaml → ...ometheus/templates/node-exporter/svc.yaml b/...eus/templates/services/node-exporter.yaml → ...ometheus/templates/node-exporter/svc.yaml
diff --git a/...mplates/rbac/pushgateway-clusterrole.yaml → ...us/templates/pushgateway/clusterrole.yaml b/...mplates/rbac/pushgateway-clusterrole.yaml → ...us/templates/pushgateway/clusterrole.yaml
diff --git a/.../rbac/pushgateway-clusterrolebinding.yaml → ...lates/pushgateway/clusterrolebinding.yaml b/.../rbac/pushgateway-clusterrolebinding.yaml → ...lates/pushgateway/clusterrolebinding.yaml
diff --git a/...us/templates/deployments/pushgateway.yaml → ...metheus/templates/pushgateway/deploy.yaml b/...us/templates/deployments/pushgateway.yaml → ...metheus/templates/pushgateway/deploy.yaml
diff --git a/...heus/templates/ingresses/pushgateway.yaml → ...etheus/templates/pushgateway/ingress.yaml b/...heus/templates/ingresses/pushgateway.yaml → ...etheus/templates/pushgateway/ingress.yaml
diff --git a/...emplates/networkpolicies/pushgateway.yaml → ...metheus/templates/pushgateway/netpol.yaml b/...emplates/networkpolicies/pushgateway.yaml → ...metheus/templates/pushgateway/netpol.yaml
diff --git a/...tes/poddisruptionbudgets/pushgateway.yaml → ...prometheus/templates/pushgateway/pdb.yaml b/...tes/poddisruptionbudgets/pushgateway.yaml → ...prometheus/templates/pushgateway/pdb.yaml
diff --git a/...ates/podsecuritypolicies/pushgateway.yaml → ...prometheus/templates/pushgateway/psp.yaml b/...ates/podsecuritypolicies/pushgateway.yaml → ...prometheus/templates/pushgateway/psp.yaml
diff --git a/...s/persistentvolumeclaims/pushgateway.yaml → ...prometheus/templates/pushgateway/pvc.yaml b/...s/persistentvolumeclaims/pushgateway.yaml → ...prometheus/templates/pushgateway/pvc.yaml
diff --git a/...theus/templates/services/pushgateway.yaml → ...etheus/templates/pushgateway/service.yaml b/...theus/templates/services/pushgateway.yaml → ...etheus/templates/pushgateway/service.yaml
diff --git a/...ates/rbac/pushgateway-serviceaccount.yaml → ...templates/pushgateway/serviceaccount.yaml b/...ates/rbac/pushgateway-serviceaccount.yaml → ...templates/pushgateway/serviceaccount.yaml
diff --git a/...us/templates/rbac/server-clusterrole.yaml → ...metheus/templates/server/clusterrole.yaml b/...us/templates/rbac/server-clusterrole.yaml → ...metheus/templates/server/clusterrole.yaml
diff --git a/...lates/rbac/server-clusterrolebinding.yaml → .../templates/server/clusterrolebinding.yaml b/...lates/rbac/server-clusterrolebinding.yaml → .../templates/server/clusterrolebinding.yaml
diff --git a/...ometheus/templates/configmaps/server.yaml → charts/prometheus/templates/server/cm.yaml b/...ometheus/templates/configmaps/server.yaml → charts/prometheus/templates/server/cm.yaml
diff --git a/...metheus/templates/deployments/server.yaml → ...s/prometheus/templates/server/deploy.yaml b/...metheus/templates/deployments/server.yaml → ...s/prometheus/templates/server/deploy.yaml
diff --git a/...s/templates/services/server-headless.yaml → ...etheus/templates/server/headless-svc.yaml b/...s/templates/services/server-headless.yaml → ...etheus/templates/server/headless-svc.yaml
diff --git a/...rometheus/templates/ingresses/server.yaml → .../prometheus/templates/server/ingress.yaml b/...rometheus/templates/ingresses/server.yaml → .../prometheus/templates/server/ingress.yaml
diff --git a/...eus/templates/networkpolicies/server.yaml → ...s/prometheus/templates/server/netpol.yaml b/...eus/templates/networkpolicies/server.yaml → ...s/prometheus/templates/server/netpol.yaml
diff --git a/...emplates/poddisruptionbudgets/server.yaml → charts/prometheus/templates/server/pdb.yaml b/...emplates/poddisruptionbudgets/server.yaml → charts/prometheus/templates/server/pdb.yaml
diff --git a/...templates/podsecuritypolicies/server.yaml → charts/prometheus/templates/server/psp.yaml b/...templates/podsecuritypolicies/server.yaml → charts/prometheus/templates/server/psp.yaml
diff --git a/...plates/persistentvolumeclaims/server.yaml → charts/prometheus/templates/server/pvc.yaml b/...plates/persistentvolumeclaims/server.yaml → charts/prometheus/templates/server/pvc.yaml
diff --git a/...us/templates/rbac/server-rolebinding.yaml → ...metheus/templates/server/rolebinding.yaml b/...us/templates/rbac/server-rolebinding.yaml → ...metheus/templates/server/rolebinding.yaml
diff --git a/...prometheus/templates/services/server.yaml → .../prometheus/templates/server/service.yaml b/...prometheus/templates/services/server.yaml → .../prometheus/templates/server/service.yaml
diff --git a/...templates/rbac/server-serviceaccount.yaml → ...heus/templates/server/serviceaccount.yaml b/...templates/rbac/server-serviceaccount.yaml → ...heus/templates/server/serviceaccount.yaml
diff --git a/...etheus/templates/statefulsets/server.yaml → charts/prometheus/templates/server/sts.yaml b/...etheus/templates/statefulsets/server.yaml → charts/prometheus/templates/server/sts.yaml
diff --git a/...plates/verticalpodautoscalers/server.yaml → charts/prometheus/templates/server/vpa.yaml b/...plates/verticalpodautoscalers/server.yaml → charts/prometheus/templates/server/vpa.yaml