From 22eef956afd2fabea494a97c10f547861d6997fe Mon Sep 17 00:00:00 2001
From: Giancarlo Rubio <gianrubio@gmail.com>
Date: Tue, 28 Nov 2017 10:30:42 +0100
Subject: [PATCH] Add script to keep kube-prometheus rules in sync with helm
charts Bump prometheus to 2.0.0, prometheus-operator to 0.15.0, alertmanager
to 0.12.0 and node-exporter to 0.15.1, grafana to 4.6.3 migrate prometheus
alerts to yaml notation
---
assets/prometheus/rules/kube-controller-manager.rules.yaml | 2 +-
.../bin/grafana_dashboards_generate.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/assets/prometheus/rules/kube-controller-manager.rules.yaml b/assets/prometheus/rules/kube-controller-manager.rules.yaml
index 4ea82ed1..b73456bd 100644
--- a/assets/prometheus/rules/kube-controller-manager.rules.yaml
+++ b/assets/prometheus/rules/kube-controller-manager.rules.yaml
@@ -10,4 +10,4 @@ groups:
description: There is no running K8S controller manager. Deployments and replication
controllers are not making progress.
runbook: https://coreos.com/tectonic/docs/latest/troubleshooting/controller-recovery.html#recovering-a-controller-manager
- summary: Controller manager is down
+ summary: Controller manager is down
\ No newline at end of file
diff --git a/hack/grafana-dashboards-configmap-generator/bin/grafana_dashboards_generate.sh b/hack/grafana-dashboards-configmap-generator/bin/grafana_dashboards_generate.sh
index b4273baa..e9d7324a 100755
--- a/hack/grafana-dashboards-configmap-generator/bin/grafana_dashboards_generate.sh
+++ b/hack/grafana-dashboards-configmap-generator/bin/grafana_dashboards_generate.sh
@@ -203,7 +203,7 @@ addArrayToConfigMap() {
# Dashboard foot
test "$type" = "dashboard" && cat $DASHBOARD_FOOT_FILE
done
- echo "---"
+ #echo "---"
IFS=$OLDIFS
return 0
--
GitLab