Skip to content

Commit cd044aa

Browse files
paulfantompaulfantom
authored
Merge pull request #1450 from paulfantom/grafana-refactor
jsonnet: include rewritten kubernetes-grafana library
2 parents 0bb5998 + 6aa6b78 commit cd044aa

File tree

5 files changed

+69
-115
lines changed

5 files changed

+69
-115
lines changed

‎jsonnet/kube-prometheus/components/grafana.libsonnet‎

Lines changed: 26 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
local kubernetesGrafana = import 'github.com/brancz/kubernetes-grafana/grafana/grafana.libsonnet';
2+
13
local defaults = {
24
local defaults = self,
35
name: 'grafana',
@@ -20,88 +22,35 @@ local defaults = {
2022
if !std.setMember(labelName, ['app.kubernetes.io/version'])
2123
},
2224
prometheusName: error 'must provide prometheus name',
23-
dashboards: {},
24-
// TODO(paulfantom): expose those to have a stable API. After kubernetes-grafana refactor those could probably be removed.
25-
rawDashboards: {},
26-
folderDashboards: {},
27-
containers: [],
28-
datasources: [],
29-
config: {},
30-
ldap: null,
31-
plugins: [],
32-
env: [],
3325
};
3426

35-
function(params) {
36-
local g = self,
37-
_config:: defaults + params,
27+
function(params)
28+
local config = defaults + params;
3829
// Safety check
39-
assert std.isObject(g._config.resources),
30+
assert std.isObject(config.resources);
4031

41-
local glib = (import 'github.com/brancz/kubernetes-grafana/grafana/grafana.libsonnet') + {
42-
_config+:: {
43-
namespace: g._config.namespace,
44-
versions+:: {
45-
grafana: g._config.version,
46-
},
47-
imageRepos+:: {
48-
grafana: std.split(g._config.image, ':')[0],
49-
},
50-
prometheus+:: {
51-
name: g._config.prometheusName,
52-
},
53-
grafana+:: {
54-
labels: g._config.commonLabels,
55-
dashboards: g._config.dashboards,
56-
resources: g._config.resources,
57-
rawDashboards: g._config.rawDashboards,
58-
folderDashboards: g._config.folderDashboards,
59-
containers: g._config.containers,
60-
config+: g._config.config,
61-
ldap: g._config.ldap,
62-
plugins+: g._config.plugins,
63-
env: g._config.env,
64-
} + (
65-
// Conditionally overwrite default setting.
66-
if std.length(g._config.datasources) > 0 then
67-
{ datasources: g._config.datasources }
68-
else {}
69-
),
70-
},
71-
},
32+
kubernetesGrafana(config) {
33+
local g = self,
34+
_config+:: config,
7235

73-
config: glib.grafana.config,
74-
service: glib.grafana.service,
75-
serviceAccount: glib.grafana.serviceAccount,
76-
deployment: glib.grafana.deployment,
77-
dashboardDatasources: glib.grafana.dashboardDatasources,
78-
dashboardSources: glib.grafana.dashboardSources,
79-
80-
dashboardDefinitions: if std.length(g._config.dashboards) > 0 ||
81-
std.length(g._config.rawDashboards) > 0 ||
82-
std.length(g._config.folderDashboards) > 0 then {
83-
apiVersion: 'v1',
84-
kind: 'ConfigMapList',
85-
items: glib.grafana.dashboardDefinitions,
86-
},
87-
serviceMonitor: {
88-
apiVersion: 'monitoring.coreos.com/v1',
89-
kind: 'ServiceMonitor',
90-
metadata: {
91-
name: 'grafana',
92-
namespace: g._config.namespace,
93-
labels: g._config.commonLabels,
94-
},
95-
spec: {
96-
selector: {
97-
matchLabels: {
98-
'app.kubernetes.io/name': 'grafana',
36+
serviceMonitor: {
37+
apiVersion: 'monitoring.coreos.com/v1',
38+
kind: 'ServiceMonitor',
39+
metadata: {
40+
name: 'grafana',
41+
namespace: g._config.namespace,
42+
labels: g._config.commonLabels,
43+
},
44+
spec: {
45+
selector: {
46+
matchLabels: {
47+
'app.kubernetes.io/name': 'grafana',
48+
},
9949
},
50+
endpoints: [{
51+
port: 'http',
52+
interval: '15s',
53+
}],
10054
},
101-
endpoints: [{
102-
port: 'http',
103-
interval: '15s',
104-
}],
10555
},
106-
},
107-
}
56+
}

‎jsonnet/kube-prometheus/main.libsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ local utils = import './lib/utils.libsonnet';
3939
images: {
4040
alertmanager: 'quay.io/prometheus/alertmanager:v' + $.values.common.versions.alertmanager,
4141
blackboxExporter: 'quay.io/prometheus/blackbox-exporter:v' + $.values.common.versions.blackboxExporter,
42-
grafana: 'grafana/grafana:v' + $.values.common.versions.grafana,
42+
grafana: 'grafana/grafana:' + $.values.common.versions.grafana,
4343
kubeStateMetrics: 'k8s.gcr.io/kube-state-metrics/kube-state-metrics:v' + $.values.common.versions.kubeStateMetrics,
4444
nodeExporter: 'quay.io/prometheus/node-exporter:v' + $.values.common.versions.nodeExporter,
4545
prometheus: 'quay.io/prometheus/prometheus:v' + $.values.common.versions.prometheus,

‎jsonnetfile.lock.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"subdir": "grafana"
99
}
1010
},
11-
"version": "c3b14b24b83cfe9abf1064649d19e2d679f033fb",
12-
"sum": "YrE4DNQsWgYWs6h0j/FjQETt8xDXdYdsslb1WK7xQEk="
11+
"version": "199e363523104ff8b3a12483a4e3eca86372b078",
12+
"sum": "/jDHzVAjHB4AOLkJHw1GyATX5ogZ1iMdcJXZAgaG3+g="
1313
},
1414
{
1515
"source": {
@@ -18,8 +18,8 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "c72947d87fce5d2b49a5494b5bb484573bd7eb11",
22-
"sum": "IF9N4i2Zgl4vm3ZHe3MDptcqLswNESKy9NMz9av8Im0="
21+
"version": "38a7d79810bd273bd078bf0931480b743afee003",
22+
"sum": "drRRtMPhvpUZ8v7Weqz7Cg2pwDA2cSb6X1pjBPoCx1w="
2323
},
2424
{
2525
"source": {
@@ -38,7 +38,7 @@
3838
"subdir": "grafana-builder"
3939
}
4040
},
41-
"version": "2ed138b205717af721af57b572bc7cd63bda62fd",
41+
"version": "87b6b50706dfa57b2470470422770f8e7574b7db",
4242
"sum": "U34Nd1ViO2LZ3D8IzygPPRfUcy6zOgCnTMVHZ+9O/QE="
4343
},
4444
{
@@ -48,8 +48,8 @@
4848
"subdir": ""
4949
}
5050
},
51-
"version": "06d00e40b43e4e618afbebe8e453b5650c659015",
52-
"sum": "oT6Vw714HjoFtnay2WFzzRk/TP2McDaYIEHI2GqNuWY="
51+
"version": "8dc2c0d69f762d943c5bfbdcc17645e346d610ca",
52+
"sum": "TamniMXp0Jy6E5OMOYtcrTJ1P+rFTVNuiOZSkxvckb8="
5353
},
5454
{
5555
"source": {
@@ -58,7 +58,7 @@
5858
"subdir": "lib/promgrafonnet"
5959
}
6060
},
61-
"version": "06d00e40b43e4e618afbebe8e453b5650c659015",
61+
"version": "8dc2c0d69f762d943c5bfbdcc17645e346d610ca",
6262
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
6363
},
6464
{
@@ -68,7 +68,7 @@
6868
"subdir": "jsonnet/kube-state-metrics"
6969
}
7070
},
71-
"version": "1e9d07bfe1509b04f6f5183c4635da2a88d14cbd",
71+
"version": "b730cb415234509e6a1425c79e826f2e7688d27b",
7272
"sum": "U1wzIpTAtOvC1yj43Y8PfvT0JfvnAcMfNH12Wi+ab0Y="
7373
},
7474
{
@@ -78,7 +78,7 @@
7878
"subdir": "jsonnet/kube-state-metrics-mixin"
7979
}
8080
},
81-
"version": "1e9d07bfe1509b04f6f5183c4635da2a88d14cbd",
81+
"version": "b730cb415234509e6a1425c79e826f2e7688d27b",
8282
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
8383
},
8484
{
@@ -88,7 +88,7 @@
8888
"subdir": "jsonnet/mixin"
8989
}
9090
},
91-
"version": "0a38647379a5e93f639bf8e634deabcc32e01fb6",
91+
"version": "f710e9d66a09efdb8edc144af555718b7d7ed2e3",
9292
"sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=",
9393
"name": "prometheus-operator-mixin"
9494
},
@@ -99,7 +99,7 @@
9999
"subdir": "jsonnet/prometheus-operator"
100100
}
101101
},
102-
"version": "0a38647379a5e93f639bf8e634deabcc32e01fb6",
102+
"version": "f710e9d66a09efdb8edc144af555718b7d7ed2e3",
103103
"sum": "4e3A/CccaxvLdWFPKJlC/P9RbPhSX6cH/Nj8+N1DBzg="
104104
},
105105
{
@@ -109,7 +109,7 @@
109109
"subdir": "doc/alertmanager-mixin"
110110
}
111111
},
112-
"version": "523c932859a8b0e4df597bd3f7b1cec6ec9ee246",
112+
"version": "1b8afe7cb5aafe59442e35979ec57401145ea26b",
113113
"sum": "pep+dHzfIjh2SU5pEkwilMCAT/NoL6YYflV4x8cr7vU=",
114114
"name": "alertmanager"
115115
},
@@ -120,8 +120,8 @@
120120
"subdir": "docs/node-mixin"
121121
}
122122
},
123-
"version": "5a38949451fb3f817e0b1f58a04e03b983f1f8a3",
124-
"sum": "EQTMeoaso8sKLp+d/ylp5wQue4yAjZJjD0Oz7Iq41tk="
123+
"version": "a59b2d89903229db0019f73200ec209758f2fd26",
124+
"sum": "Yr1xB+EEdBYRbsCtl4MDvx6phDg3UoMQtfpWADHyeGk="
125125
},
126126
{
127127
"source": {
@@ -130,7 +130,7 @@
130130
"subdir": "documentation/prometheus-mixin"
131131
}
132132
},
133-
"version": "60d099088692b6b5bf4b8f4e13f76bd3921da99e",
133+
"version": "c092a74be9cc3e8e3db41efe3136128cef6c1add",
134134
"sum": "m4VHwft4fUcxzL4+52lLZG/V5aH5ZEdjaweb88vISL0=",
135135
"name": "prometheus"
136136
},
@@ -141,7 +141,7 @@
141141
"subdir": "mixin"
142142
}
143143
},
144-
"version": "fa476b5f6f4d7015a53bcdb6f0a70ec2a1ac3bb2",
144+
"version": "d2d53e575b489a8cbfc9e1723d0e3f62a68faf39",
145145
"sum": "Og+wEHfgzXBvBLAeeQvGNoiCw3FY4LQHlJdpsG/owj8=",
146146
"name": "thanos-mixin"
147147
},

0 commit comments

Comments
 (0)