easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #968 from brancz/grafana-v5

Browse Source 
kube-prometheus: Upgrade to grafana v5
This commit is contained in:
Antoine Legrand
2018-02-12 10:41:07 +01:00
committed by GitHub
parent acb10c1678 85f88025f3
commit 8a0c21ff29
24 changed files with 7510 additions and 7682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hack/scripts/generate-dashboards-configmap.sh
View File

@@ -6,7 +6,7 @@ cat <<-EOF
apiVersion: v1
kind: ConfigMap
metadata:
name: grafana-dashboards-0
name: grafana-dashboard-definitions-0
data:
EOF
@@ -37,10 +37,3 @@ do
hack/scripts/wrap-dashboard.sh $f prometheus | sed "s/^/ /g"
fi
done
for f in assets/grafana/*-datasource.json
do
cp $f assets/grafana/generated/
echo " $(basename $f): |+"
cat $f | sed "s/^/ /g"
done

6
hack/scripts/generate-manifests.sh
View File

@@ -6,16 +6,16 @@ set +x
hack/scripts/generate-rules-configmap.sh > manifests/prometheus/prometheus-k8s-rules.yaml
# Generate Dashboard ConfigMap
hack/scripts/generate-dashboards-configmap.sh > manifests/grafana/grafana-dashboards.yaml
hack/scripts/generate-dashboards-configmap.sh > manifests/grafana/grafana-dashboard-definitions.yaml
# Generate Dashboard ConfigMap with configmap-generator tool
# Max Size per ConfigMap: 240000
# Input dir: assets/grafana
# output file: manifests/grafana/grafana-dashboards.yaml
# grafana deployment output file: manifests/grafana/grafana-deployment.yaml
test -f manifests/grafana/grafana-dashboards.yaml && rm -f manifests/grafana/grafana-dashboards.yaml
test -f manifests/grafana/grafana-dashboards.yaml && rm -f manifests/grafana/grafana-dashboard-definitions.yaml
test -f manifests/grafana/grafana-deployment.yaml && rm -f manifests/grafana/grafana-deployment.yaml
hack/grafana-dashboards-configmap-generator/bin/grafana_dashboards_generate.sh -s 240000 -i assets/grafana/generated -o manifests/grafana/grafana-dashboards.yaml -g manifests/grafana/grafana-deployment.yaml
hack/grafana-dashboards-configmap-generator/bin/grafana_dashboards_generate.sh -s 240000 -i assets/grafana/generated -o manifests/grafana/grafana-dashboard-definitions.yaml -g manifests/grafana/grafana-deployment.yaml
# Generate Grafana Credentials Secret
hack/scripts/generate-grafana-credentials-secret.sh admin admin > manifests/grafana/grafana-credentials.yaml