Skip to content

Commit 2053eee

Browse files
esaraesara
committed
kube-prometheus move from coreos to prometheus-operator
1 parent aa4f1b7 commit 2053eee

File tree

103 files changed

+27600
-24268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+27600
-24268
lines changed

‎base_operator_stack.jsonnet‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
1+
local k = import 'ksonnet-lib/ksonnet.beta.4/k.libsonnet';
22
local utils = import 'utils.libsonnet';
33
local vars = import 'vars.jsonnet';
44

@@ -17,7 +17,7 @@ local vars = import 'vars.jsonnet';
1717
prometheus+:: {
1818
names: 'k8s',
1919
replicas: 1,
20-
namespaces: ['default', 'kube-system', 'monitoring'],
20+
namespaces: ['default', 'kube-system', vars._config.namespace],
2121
},
2222

2323
alertmanager+:: {
@@ -60,7 +60,7 @@ local vars = import 'vars.jsonnet';
6060
},
6161
},
6262
plugins: vars.grafana.plugins,
63-
env: vars.grafana.env
63+
env: vars.grafana.env,
6464
},
6565
},
6666
//---------------------------------------

‎jsonnetfile.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,18 @@
44
{
55
"source": {
66
"git": {
7-
"remote": "https://github.com/coreos/kube-prometheus.git",
7+
"remote": "https://github.com/prometheus-operator/kube-prometheus.git",
88
"subdir": "jsonnet/kube-prometheus"
99
}
1010
},
11+
"version": "main"
12+
},
13+
{
14+
"source": {
15+
"git": {
16+
"remote": "https://github.com/ksonnet/ksonnet-lib.git"
17+
}
18+
},
1119
"version": "master"
1220
}
1321
],

‎jsonnetfile.lock.json‎

Lines changed: 90 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,48 +8,48 @@
88
"subdir": "grafana"
99
}
1010
},
11-
"version": "57b4365eacda291b82e0d55ba7eec573a8198dda",
12-
"sum": "92DWADwGjnCfpZaL7Q07C0GZayxBziGla/O03qWea34="
11+
"version": "d039275e4916aceae1c137120882e01d857787ac",
12+
"sum": "515vMn4x4tP8vegL4HLW0nDO5+njGTgnDZB5OOhtsCI="
1313
},
1414
{
1515
"source": {
1616
"git": {
17-
"remote": "https://github.com/coreos/etcd.git",
18-
"subdir": "Documentation/etcd-mixin"
17+
"remote": "https://github.com/etcd-io/etcd.git",
18+
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "d8c8f903eee10b8391abaef7758c38b2cd393c55",
22-
"sum": "pk7mLpdUrHuJKkj2vhD6LGMU7P+oYYooBXAeZyZa398="
21+
"version": "e73f55d4e94666c99558baa2fd4e365aeaca4dc4",
22+
"sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds="
2323
},
2424
{
2525
"source": {
2626
"git": {
27-
"remote": "https://github.com/coreos/kube-prometheus.git",
28-
"subdir": "jsonnet/kube-prometheus"
27+
"remote": "https://github.com/grafana/grafana.git",
28+
"subdir": "grafana-mixin"
2929
}
3030
},
31-
"version": "17989b42aa10b1c6afa07043cb05bcd5ae492284",
32-
"sum": "2FR289B1LGUf5tTN4PXBj5TjRX7okSFxE8uHkSslzDQ="
31+
"version": "1120f9e255760a3c104b57871fcb91801e934382",
32+
"sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
3333
},
3434
{
3535
"source": {
3636
"git": {
37-
"remote": "https://github.com/coreos/prometheus-operator.git",
38-
"subdir": "jsonnet/prometheus-operator"
37+
"remote": "https://github.com/grafana/grafonnet-lib.git",
38+
"subdir": "grafonnet"
3939
}
4040
},
41-
"version": "e31c69f9b5c6555e0f4a5c1f39d0f03182dd6b41",
42-
"sum": "WggWVWZ+CBEUThQCztSaRELbtqdXf9s3OFzf06HbYNA="
41+
"version": "30280196507e0fe6fa978a3e0eaca3a62844f817",
42+
"sum": "342u++/7rViR/zj2jeJOjshzglkZ1SY+hFNuyCBFMdc="
4343
},
4444
{
4545
"source": {
4646
"git": {
4747
"remote": "https://github.com/grafana/grafonnet-lib.git",
48-
"subdir": "grafonnet"
48+
"subdir": "grafonnet-7.0"
4949
}
5050
},
51-
"version": "8fb95bd89990e493a8534205ee636bfcb8db67bd",
52-
"sum": "tDuuSKE9f4Ew2bjBM33Rs6behLEAzkmKkShSt+jpAak="
51+
"version": "30280196507e0fe6fa978a3e0eaca3a62844f817",
52+
"sum": "gCtR9s/4D5fxU9aKXg0Bru+/njZhA0YjLjPiASc61FM="
5353
},
5454
{
5555
"source": {
@@ -58,8 +58,8 @@
5858
"subdir": "grafana-builder"
5959
}
6060
},
61-
"version": "881db2241f0c5007c3e831caf34b0c645202b4ab",
62-
"sum": "slxrtftVDiTlQK22ertdfrg4Epnq97gdrLI63ftUfaE="
61+
"version": "d68f9a6e0b1af7c4c4056dc2b43fb8f3bac01f43",
62+
"sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0="
6363
},
6464
{
6565
"source": {
@@ -69,8 +69,7 @@
6969
}
7070
},
7171
"version": "0d2f82676817bbf9e4acf6495b2090205f323b9f",
72-
"sum": "h28BXZ7+vczxYJ2sCt8JuR9+yznRtU/iA6DCpQUrtEg=",
73-
"name": "ksonnet"
72+
"sum": "h28BXZ7+vczxYJ2sCt8JuR9+yznRtU/iA6DCpQUrtEg="
7473
},
7574
{
7675
"source": {
@@ -79,38 +78,70 @@
7978
"subdir": ""
8079
}
8180
},
82-
"version": "b61c5a34051f8f57284a08fe78ad8a45b430252b",
83-
"sum": "7Hx/5eNm7ubLTsdrpk3b2+e/FLR3XOa4HCukmbRUCAY="
81+
"version": "3c386687c1f8ceb6b79ff887c4a934e9cee1b90a",
82+
"sum": "H8lcnk7gQEUoRi58/xq+JTfd2PcjJUjMQHgxGklUiFY="
8483
},
8584
{
8685
"source": {
8786
"git": {
88-
"remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git",
89-
"subdir": "lib/promgrafonnet"
87+
"remote": "https://github.com/kubernetes/kube-state-metrics.git",
88+
"subdir": "jsonnet/kube-state-metrics"
9089
}
9190
},
92-
"version": "b61c5a34051f8f57284a08fe78ad8a45b430252b",
93-
"sum": "VhgBM39yv0f4bKv8VfGg4FXkg573evGDRalip9ypKbc="
91+
"version": "71200632a6c97e9b87166dbb27489798a05effe3",
92+
"sum": "4PJ2ROxODsoYO/1Y70+dgLZVjW5zlfzB+TDpxJBHwaI="
9493
},
9594
{
9695
"source": {
9796
"git": {
9897
"remote": "https://github.com/kubernetes/kube-state-metrics.git",
99-
"subdir": "jsonnet/kube-state-metrics"
98+
"subdir": "jsonnet/kube-state-metrics-mixin"
10099
}
101100
},
102-
"version": "d667979ed55ad1c4db44d331b51d646f5b903aa7",
103-
"sum": "cJjGZaLBjcIGrLHZLjRPU9c3KL+ep9rZTb9dbALSKqA="
101+
"version": "71200632a6c97e9b87166dbb27489798a05effe3",
102+
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
104103
},
105104
{
106105
"source": {
107106
"git": {
108-
"remote": "https://github.com/kubernetes/kube-state-metrics.git",
109-
"subdir": "jsonnet/kube-state-metrics-mixin"
107+
"remote": "https://github.com/prometheus-operator/kube-prometheus.git",
108+
"subdir": "jsonnet/kube-prometheus"
109+
}
110+
},
111+
"version": "37d00082289c587f5a02a343ba23cfbe167000e2",
112+
"sum": "5onAaPSrjnmgXIAsypnx0W/sIA7iTsHCeCjPrhGxj5A="
113+
},
114+
{
115+
"source": {
116+
"git": {
117+
"remote": "https://github.com/prometheus-operator/prometheus-operator.git",
118+
"subdir": "jsonnet/mixin"
119+
}
120+
},
121+
"version": "df4cbd9526d8ff8e404a903b7ed2532847551d19",
122+
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
123+
"name": "prometheus-operator-mixin"
124+
},
125+
{
126+
"source": {
127+
"git": {
128+
"remote": "https://github.com/prometheus-operator/prometheus-operator.git",
129+
"subdir": "jsonnet/prometheus-operator"
110130
}
111131
},
112-
"version": "d667979ed55ad1c4db44d331b51d646f5b903aa7",
113-
"sum": "o5avaguRsfFwYFNen00ZEsub1x4i8Z/ZZ2QoEjFMff8="
132+
"version": "df4cbd9526d8ff8e404a903b7ed2532847551d19",
133+
"sum": "wJ1E8XxYJ0RJrUuDNWLzE7bzo6JrH7P9q1lAu/xi4Ow="
134+
},
135+
{
136+
"source": {
137+
"git": {
138+
"remote": "https://github.com/prometheus/alertmanager.git",
139+
"subdir": "doc/alertmanager-mixin"
140+
}
141+
},
142+
"version": "8afd462a9eaa3979bddf7bd6278bede4bc1f30e2",
143+
"sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=",
144+
"name": "alertmanager"
114145
},
115146
{
116147
"source": {
@@ -119,8 +150,8 @@
119150
"subdir": "docs/node-mixin"
120151
}
121152
},
122-
"version": "08ce3c6dd430deb51798826701a395e460620d60",
123-
"sum": "3jFV2qsc/GZe2GADswTYqxxP2zGOiANTj73W/VNFGqc="
153+
"version": "a3bd2e13052929663dbd7d680fab4a952efb1de6",
154+
"sum": "TwdaTm0Z++diiLyaKAAimmC6hBL7XbrJc0RHhBCpAdU="
124155
},
125156
{
126157
"source": {
@@ -129,9 +160,30 @@
129160
"subdir": "documentation/prometheus-mixin"
130161
}
131162
},
132-
"version": "74207c04655e1fd93eea0e9a5d2f31b1cbc4d3d0",
133-
"sum": "lEzhZ8gllSfAO4kmXeTwl4W0anapIeFd5GCaCNuDe18=",
163+
"version": "84c6f0e58444a452a5e2e19d14221409d2b9d790",
164+
"sum": "LRx0tbMnoE1p8KEn+i81j2YsA5Sgt3itE5Y6jBf5eOQ=",
134165
"name": "prometheus"
166+
},
167+
{
168+
"source": {
169+
"git": {
170+
"remote": "https://github.com/pyrra-dev/pyrra.git",
171+
"subdir": "config/crd/bases"
172+
}
173+
},
174+
"version": "2584cefb8e6859eb9ee103df199e232cd0066aab",
175+
"sum": "d1550yhsX4VxdVN7b0gWT0cido/W90P6OGLzLqPwZcs="
176+
},
177+
{
178+
"source": {
179+
"git": {
180+
"remote": "https://github.com/thanos-io/thanos.git",
181+
"subdir": "mixin"
182+
}
183+
},
184+
"version": "3327c510076a77f876ac26e699d5252a61fc529a",
185+
"sum": "Io++1+lp1oQVoQiVRSCXUiGdTIRPV7aL6Ewgs3bShEs=",
186+
"name": "thanos-mixin"
135187
}
136188
],
137189
"legacyImports": false

‎main.jsonnet‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
local utils = import 'utils.libsonnet';
22
local vars = import 'vars.jsonnet';
33

4-
local kp = (import 'kube-prometheus/kube-prometheus.libsonnet')
5-
+ (import 'kube-prometheus/kube-prometheus-anti-affinity.libsonnet')
6-
+ (import 'kube-prometheus/kube-prometheus-kops-coredns.libsonnet')
7-
+ (import 'kube-prometheus/kube-prometheus-kubeadm.libsonnet')
4+
local kp = (import 'kube-prometheus/main.libsonnet') + { values+:: { common+: { namespace: vars._config.namespace } } }
5+
+ (import 'kube-prometheus/addons/anti-affinity.libsonnet')
6+
+ (import 'kube-prometheus/platforms/kops-coredns.libsonnet')
7+
+ (import 'kube-prometheus/platforms/kubeadm.libsonnet')
88
// Additional modules are loaded dynamically from vars.jsonnet
99
+ utils.join_objects([module.file for module in vars.modules if module.enabled])
1010
// Load K3s customized modules
@@ -14,6 +14,7 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet')
1414
// Load image versions last to override default from modules
1515
+ (import 'image_sources_versions.jsonnet');
1616

17+
1718
// Generate core modules
1819
{ ['setup/0namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) }
1920
// First generate operator resources except the serviceMonitors

‎manifests/alertmanager-alertmanager.yaml‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ apiVersion: monitoring.coreos.com/v1
22
kind: Alertmanager
33
metadata:
44
labels:
5-
alertmanager: main
5+
app.kubernetes.io/component: alert-router
6+
app.kubernetes.io/instance: main
7+
app.kubernetes.io/name: alertmanager
8+
app.kubernetes.io/part-of: kube-prometheus
9+
app.kubernetes.io/version: 0.25.0
610
name: main
711
namespace: monitoring
812
spec:
@@ -11,22 +15,36 @@ spec:
1115
preferredDuringSchedulingIgnoredDuringExecution:
1216
- podAffinityTerm:
1317
labelSelector:
14-
matchExpressions:
15-
- key: alertmanager
16-
operator: In
17-
values:
18-
- main
18+
matchLabels:
19+
app.kubernetes.io/component: alert-router
20+
app.kubernetes.io/instance: main
21+
app.kubernetes.io/name: alertmanager
22+
app.kubernetes.io/part-of: kube-prometheus
1923
namespaces:
2024
- monitoring
2125
topologyKey: kubernetes.io/hostname
2226
weight: 100
23-
image: prom/alertmanager:v0.21.0
27+
image: quay.io/prometheus/alertmanager:v0.25.0
2428
nodeSelector:
2529
kubernetes.io/os: linux
26-
replicas: 1
30+
podMetadata:
31+
labels:
32+
app.kubernetes.io/component: alert-router
33+
app.kubernetes.io/instance: main
34+
app.kubernetes.io/name: alertmanager
35+
app.kubernetes.io/part-of: kube-prometheus
36+
app.kubernetes.io/version: 0.25.0
37+
replicas: 3
38+
resources:
39+
limits:
40+
cpu: 100m
41+
memory: 100Mi
42+
requests:
43+
cpu: 4m
44+
memory: 100Mi
2745
securityContext:
2846
fsGroup: 2000
2947
runAsNonRoot: true
3048
runAsUser: 1000
3149
serviceAccountName: alertmanager-main
32-
version: v0.21.0
50+
version: 0.25.0

‎manifests/alertmanager-networkPolicy.yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
apiVersion: networking.k8s.io/v1
2+
kind: NetworkPolicy
3+
metadata:
4+
labels:
5+
app.kubernetes.io/component: alert-router
6+
app.kubernetes.io/instance: main
7+
app.kubernetes.io/name: alertmanager
8+
app.kubernetes.io/part-of: kube-prometheus
9+
app.kubernetes.io/version: 0.25.0
10+
name: alertmanager-main
11+
namespace: monitoring
12+
spec:
13+
egress:
14+
- {}
15+
ingress:
16+
- from:
17+
- podSelector:
18+
matchLabels:
19+
app.kubernetes.io/name: prometheus
20+
ports:
21+
- port: 9093
22+
protocol: TCP
23+
- port: 8080
24+
protocol: TCP
25+
- from:
26+
- podSelector:
27+
matchLabels:
28+
app.kubernetes.io/name: alertmanager
29+
ports:
30+
- port: 9094
31+
protocol: TCP
32+
- port: 9094
33+
protocol: UDP
34+
podSelector:
35+
matchLabels:
36+
app.kubernetes.io/component: alert-router
37+
app.kubernetes.io/instance: main
38+
app.kubernetes.io/name: alertmanager
39+
app.kubernetes.io/part-of: kube-prometheus
40+
policyTypes:
41+
- Egress
42+
- Ingress

0 commit comments

Comments
 (0)