Merge "Added Grafana iDRAC dashboard"
This commit is contained in:
commit
4665ebd35f
@ -15,7 +15,7 @@ apiVersion: v1
|
||||
appVersion: v7.4.5
|
||||
description: OpenStack-Helm Grafana
|
||||
name: grafana
|
||||
version: 0.1.11
|
||||
version: 0.1.12
|
||||
home: https://grafana.com/
|
||||
sources:
|
||||
- https://github.com/grafana/grafana
|
||||
|
@ -1,25 +0,0 @@
|
||||
{{/*
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/}}
|
||||
|
||||
{{- if .Values.manifests.configmap_dashboards_alertmanager }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: grafana-dashboards-alertmanager
|
||||
data:
|
||||
{{ range $key, $value := .Values.conf.dashboards_alertmanager }}
|
||||
{{$key}}.json: {{ $value | toJson }}
|
||||
{{ end }}
|
||||
{{- end }}
|
@ -13,13 +13,15 @@ limitations under the License.
|
||||
*/}}
|
||||
|
||||
{{- if .Values.manifests.configmap_dashboards }}
|
||||
{{ range $group, $dashboards := .Values.conf.dashboards }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: grafana-dashboards
|
||||
name: grafana-dashboards-{{$group}}
|
||||
data:
|
||||
{{ range $key, $value := .Values.conf.dashboards }}
|
||||
{{ range $key, $value := $dashboards }}
|
||||
{{$key}}.json: {{ $value | toJson }}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
{{- end }}
|
||||
|
@ -120,18 +120,14 @@ spec:
|
||||
subPath: ldap.toml
|
||||
- name: data
|
||||
mountPath: /var/lib/grafana/data
|
||||
{{- range $key, $value := .Values.conf.dashboards }}
|
||||
- name: grafana-dashboards
|
||||
{{- range $group, $dashboards := .Values.conf.dashboards }}
|
||||
{{- range $key, $value := $dashboards }}
|
||||
- name: grafana-dashboards-{{$group}}
|
||||
mountPath: /etc/grafana/dashboards/{{$key}}.json
|
||||
subPath: {{$key}}.json
|
||||
{{- end }}
|
||||
{{- if .Values.manifests.configmap_dashboards_alertmanager }}
|
||||
{{- range $key, $value := .Values.conf.dashboards_alertmanager }}
|
||||
- name: grafana-dashboards-alertmanager
|
||||
mountPath: /etc/grafana/dashboards/{{$key}}.json
|
||||
subPath: {{$key}}.json
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
{{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_db.auth.admin.secret.tls.internal "path" "/etc/mysql/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
|
||||
{{ if $mounts_grafana.volumeMounts }}{{ toYaml $mounts_grafana.volumeMounts | indent 12 }}{{ end }}
|
||||
volumes:
|
||||
@ -153,16 +149,12 @@ spec:
|
||||
secret:
|
||||
secretName: grafana-etc
|
||||
defaultMode: 0444
|
||||
- name: grafana-dashboards
|
||||
{{- range $group, $dashboards := .Values.conf.dashboards }}
|
||||
- name: grafana-dashboards-{{$group}}
|
||||
configMap:
|
||||
name: grafana-dashboards
|
||||
name: grafana-dashboards-{{$group}}
|
||||
defaultMode: 0555
|
||||
{{- if .Values.manifests.configmap_dashboards_alertmanager }}
|
||||
- name: grafana-dashboards-alertmanager
|
||||
configMap:
|
||||
name: grafana-dashboards-alertmanager
|
||||
defaultMode: 0555
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
- name: data
|
||||
emptyDir: {}
|
||||
{{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_db.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
|
||||
|
@ -367,7 +367,6 @@ manifests:
|
||||
configmap_bin: true
|
||||
configmap_etc: true
|
||||
configmap_dashboards: true
|
||||
configmap_dashboards_alertmanager: false
|
||||
deployment: true
|
||||
ingress: true
|
||||
helm_tests: true
|
||||
@ -486,5 +485,4 @@ conf:
|
||||
grafana_net:
|
||||
url: https://grafana.net
|
||||
dashboards: {}
|
||||
dashboards_alertmanager: {}
|
||||
...
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -3,106 +3,107 @@
|
||||
---
|
||||
conf:
|
||||
dashboards:
|
||||
home_dashboard: |-
|
||||
{
|
||||
"annotations": {
|
||||
"list": [
|
||||
{
|
||||
"builtIn": 1,
|
||||
"datasource": "-- Grafana --",
|
||||
"enable": true,
|
||||
"hide": true,
|
||||
"iconColor": "rgba(0, 211, 255, 1)",
|
||||
"name": "Annotations & Alerts",
|
||||
"type": "dashboard"
|
||||
}
|
||||
]
|
||||
},
|
||||
"editable": true,
|
||||
"gnetId": null,
|
||||
"graphTooltip": 0,
|
||||
"id": 66,
|
||||
"links": [],
|
||||
"panels": [
|
||||
{
|
||||
"content": "<div class=\"text-center dashboard-header\">\n <span>OSH Home Dashboard</span>\n</div>",
|
||||
"editable": true,
|
||||
"gridPos": {
|
||||
"h": 3,
|
||||
"w": 24,
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"id": 1,
|
||||
"links": [],
|
||||
"mode": "html",
|
||||
"options": {},
|
||||
"style": {},
|
||||
"title": "",
|
||||
"transparent": true,
|
||||
"type": "text"
|
||||
home:
|
||||
home_dashboard: |-
|
||||
{
|
||||
"annotations": {
|
||||
"list": [
|
||||
{
|
||||
"builtIn": 1,
|
||||
"datasource": "-- Grafana --",
|
||||
"enable": true,
|
||||
"hide": true,
|
||||
"iconColor": "rgba(0, 211, 255, 1)",
|
||||
"name": "Annotations & Alerts",
|
||||
"type": "dashboard"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"folderId": 0,
|
||||
"gridPos": {
|
||||
"h": 10,
|
||||
"w": 13,
|
||||
"x": 6,
|
||||
"y": 3
|
||||
"editable": true,
|
||||
"gnetId": null,
|
||||
"graphTooltip": 0,
|
||||
"id": 66,
|
||||
"links": [],
|
||||
"panels": [
|
||||
{
|
||||
"content": "<div class=\"text-center dashboard-header\">\n <span>OSH Home Dashboard</span>\n</div>",
|
||||
"editable": true,
|
||||
"gridPos": {
|
||||
"h": 3,
|
||||
"w": 24,
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"id": 1,
|
||||
"links": [],
|
||||
"mode": "html",
|
||||
"options": {},
|
||||
"style": {},
|
||||
"title": "",
|
||||
"transparent": true,
|
||||
"type": "text"
|
||||
},
|
||||
"headings": true,
|
||||
"id": 3,
|
||||
"limit": 30,
|
||||
"links": [],
|
||||
"options": {},
|
||||
"query": "",
|
||||
"recent": true,
|
||||
"search": false,
|
||||
"starred": true,
|
||||
"tags": [],
|
||||
"title": "",
|
||||
"type": "dashlist"
|
||||
}
|
||||
],
|
||||
"schemaVersion": 18,
|
||||
"style": "dark",
|
||||
"tags": [],
|
||||
"templating": {
|
||||
"list": []
|
||||
},
|
||||
"time": {
|
||||
"from": "now-1h",
|
||||
"to": "now"
|
||||
},
|
||||
"timepicker": {
|
||||
"hidden": true,
|
||||
"refresh_intervals": [
|
||||
"5s",
|
||||
"10s",
|
||||
"30s",
|
||||
"1m",
|
||||
"5m",
|
||||
"15m",
|
||||
"30m",
|
||||
"1h",
|
||||
"2h",
|
||||
"1d"
|
||||
{
|
||||
"folderId": 0,
|
||||
"gridPos": {
|
||||
"h": 10,
|
||||
"w": 13,
|
||||
"x": 6,
|
||||
"y": 3
|
||||
},
|
||||
"headings": true,
|
||||
"id": 3,
|
||||
"limit": 30,
|
||||
"links": [],
|
||||
"options": {},
|
||||
"query": "",
|
||||
"recent": true,
|
||||
"search": false,
|
||||
"starred": true,
|
||||
"tags": [],
|
||||
"title": "",
|
||||
"type": "dashlist"
|
||||
}
|
||||
],
|
||||
"time_options": [
|
||||
"5m",
|
||||
"15m",
|
||||
"1h",
|
||||
"6h",
|
||||
"12h",
|
||||
"24h",
|
||||
"2d",
|
||||
"7d",
|
||||
"30d"
|
||||
],
|
||||
"type": "timepicker"
|
||||
},
|
||||
"timezone": "browser",
|
||||
"title": "OSH Home",
|
||||
"version": 1
|
||||
}
|
||||
"schemaVersion": 18,
|
||||
"style": "dark",
|
||||
"tags": [],
|
||||
"templating": {
|
||||
"list": []
|
||||
},
|
||||
"time": {
|
||||
"from": "now-1h",
|
||||
"to": "now"
|
||||
},
|
||||
"timepicker": {
|
||||
"hidden": true,
|
||||
"refresh_intervals": [
|
||||
"5s",
|
||||
"10s",
|
||||
"30s",
|
||||
"1m",
|
||||
"5m",
|
||||
"15m",
|
||||
"30m",
|
||||
"1h",
|
||||
"2h",
|
||||
"1d"
|
||||
],
|
||||
"time_options": [
|
||||
"5m",
|
||||
"15m",
|
||||
"1h",
|
||||
"6h",
|
||||
"12h",
|
||||
"24h",
|
||||
"2d",
|
||||
"7d",
|
||||
"30d"
|
||||
],
|
||||
"type": "timepicker"
|
||||
},
|
||||
"timezone": "browser",
|
||||
"title": "OSH Home",
|
||||
"version": 1
|
||||
}
|
||||
...
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -12,4 +12,5 @@ grafana:
|
||||
- 0.1.9 Add Alertmanager dashboard to Grafana
|
||||
- 0.1.10 Helm 3 - Fix Job labels
|
||||
- 0.1.11 Update htk requirements
|
||||
- 0.1.12 Add iDRAC dashboard to Grafana
|
||||
...
|
||||
|
Loading…
x
Reference in New Issue
Block a user