Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kommander: Fixes to the clusters summary dashboard #460

Merged
merged 5 commits into from
Feb 25, 2020
Merged

kommander: Fixes to the clusters summary dashboard #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce56818
kommander: Fix managed cluster count graph
gracedo Feb 21, 2020
e1fe43e
kommander: Bump chart version
gracedo Feb 21, 2020
b4c69ef
kommander: Change clusters dashboard uid
gracedo Feb 21, 2020
a56951e
kommander: Use dashboard name for home dashboard job
gracedo Feb 24, 2020
a00c7f1
kommander: Add [Global] suffix to clusters dashbaord name
gracedo Feb 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stable/kommander/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ maintainers:
- name: alejandroEsc
- name: jimmidyson
name: kommander
version: 0.4.15
version: 0.4.16
21 changes: 6 additions & 15 deletions stable/kommander/templates/grafana/dashboards/k8s-resources-clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,7 @@ metadata:
data:
k8s-resources-clusters-dashboard.json: |-
{
"__inputs": [
{
"name": "DS_KOMMANDERPROMETHEUS",
"label": "KommanderPrometheus",
"description": "",
"type": "datasource",
"pluginId": "prometheus",
"pluginName": "Prometheus"
}
],
"__inputs": [],
"__requires": [
{
"type": "grafana",
Expand Down Expand Up @@ -70,12 +61,12 @@ data:
"gnetId": null,
"graphTooltip": 0,
"id": null,
"iteration": 1582226941429,
"iteration": 1582323837127,
"links": [],
"panels": [
{
"cacheTimeout": null,
"datasource": "${DS_KOMMANDERPROMETHEUS}",
"datasource": "$datasource",
"gridPos": {
"h": 6,
"w": 24,
Expand Down Expand Up @@ -124,7 +115,7 @@ data:
"pluginVersion": "6.6.0",
"targets": [
{
"expr": "count(thanos_store_nodes_grpc_connections)",
"expr": "count(prometheus_build_info)",
"refId": "A"
}
],
Expand Down Expand Up @@ -2677,8 +2668,8 @@ data:
]
},
"timezone": "",
"title": "Kubernetes / Compute Resources / Clusters",
"uid": "efa86fd1d0c121a26444b636a3f509a8",
"title": "Kubernetes / Compute Resources / Cluster [Global]",
"uid": "f0U1EswWk",
joejulian marked this conversation as resolved.
Show resolved Hide resolved
"version": 1
}
{{- end }}
2 changes: 1 addition & 1 deletion stable/kommander/templates/grafana/hooks-home-dashboard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ data:
set -o errexit
set -o pipefail
CURL="curl --verbose --fail --max-time 30 --retry 20 --retry-connrefused"
DASHBOARD_ID=$($CURL -H "X-Forwarded-User: $X_FORWARDED_USER" {{ .Values.grafana.hooks.serviceURL }}/api/dashboards/uid/{{ .Values.grafana.hooks.homeDashboardUID }} | jq '.dashboard.id')
DASHBOARD_ID=$($CURL -H "X-Forwarded-User: $X_FORWARDED_USER" {{ .Values.grafana.hooks.serviceURL }}/api/search/?query={{ .Values.grafana.hooks.dashboardName | urlquery }} | jq '.[0].id')
echo "setting home dashboard to ID" $DASHBOARD_ID
$CURL -X PUT -H "Content-Type: application/json" -H "X-Forwarded-User: $X_FORWARDED_USER" -d '{"homeDashboardId":'"$DASHBOARD_ID"'}' {{ .Values.grafana.hooks.serviceURL }}/api/org/preferences
---
Expand Down
3 changes: 1 addition & 2 deletions stable/kommander/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ grafana:
image: dwdraju/alpine-curl-jq
secretKeyRef: ops-portal-username
serviceURL: http://kommander-kubeaddons-grafana.kommander
# This is the UID of the "Kubernetes / Compute Resources / Clusters" summary dashboard
homeDashboardUID: efa86fd1d0c121a26444b636a3f509a8
dashboardName: "Kubernetes / Compute Resources / Cluster [Global]"
kommanderServiceAccount: kommander-kubeaddons

## Do not deploy default dashboards.
Expand Down