Skip to content

Commit f5cf21f

Browse files
lunkan93lunkan93
committed
rook-ceph: add exporter psp and fix dashboard
1 parent fb4eaa8 commit f5cf21f

File tree

2 files changed

+40
-15
lines changed

2 files changed

+40
-15
lines changed

‎rook/helmfile.d/charts/rook-ceph-dashboards/files/ceph-cluster.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
"pluginVersion": "7.0.3",
192192
"targets": [
193193
{
194-
"expr": "sum without (instance, ceph_daemon) (irate(ceph_osd_op_w_in_bytes{cluster=\"$cluster\"}[5m]))",
194+
"expr": "sum (irate(ceph_osd_op_w_in_bytes{cluster=\"$cluster\"}[5m]))",
195195
"format": "time_series",
196196
"instant": true,
197197
"interval": "$interval",
@@ -260,7 +260,7 @@
260260
"pluginVersion": "7.0.3",
261261
"targets": [
262262
{
263-
"expr": "sum without (ceph_daemon, instance) (irate(ceph_osd_op_r_out_bytes{cluster=\"$cluster\"}[5m]))",
263+
"expr": "sum (irate(ceph_osd_op_r_out_bytes{cluster=\"$cluster\"}[5m]))",
264264
"format": "time_series",
265265
"instant": true,
266266
"interval": "$interval",
@@ -328,7 +328,7 @@
328328
"pluginVersion": "7.0.3",
329329
"targets": [
330330
{
331-
"expr": "sum without (instance) (ceph_cluster_total_bytes{cluster=\"$cluster\"})",
331+
"expr": "sum (ceph_cluster_total_bytes{cluster=\"$cluster\"})",
332332
"format": "time_series",
333333
"instant": true,
334334
"interval": "$interval",
@@ -551,7 +551,7 @@
551551
"pluginVersion": "7.0.3",
552552
"targets": [
553553
{
554-
"expr": "sum without (instance, ceph_daemon) (ceph_osd_op_w_in_bytes{cluster=\"$cluster\"})",
554+
"expr": "sum (ceph_osd_op_w_in_bytes{cluster=\"$cluster\"})",
555555
"format": "time_series",
556556
"instant": false,
557557
"interval": "$interval",
@@ -620,7 +620,7 @@
620620
"pluginVersion": "7.0.3",
621621
"targets": [
622622
{
623-
"expr": "sum without (instance, ceph_daemon) (ceph_osd_op_r_out_bytes{cluster=\"$cluster\"})",
623+
"expr": "sum (ceph_osd_op_r_out_bytes{cluster=\"$cluster\"})",
624624
"format": "time_series",
625625
"instant": false,
626626
"interval": "$interval",
@@ -758,7 +758,7 @@
758758
"pluginVersion": "7.0.3",
759759
"targets": [
760760
{
761-
"expr": "sum without (ceph_daemon, instance) (irate(ceph_osd_op_w{cluster=\"$cluster\"}[5m]))",
761+
"expr": "sum (irate(ceph_osd_op_w{cluster=\"$cluster\"}[5m]))",
762762
"format": "time_series",
763763
"instant": true,
764764
"interval": "$interval",
@@ -827,7 +827,7 @@
827827
"pluginVersion": "7.0.3",
828828
"targets": [
829829
{
830-
"expr": "sum without (ceph_daemon, instance) (irate(ceph_osd_op_r{cluster=\"$cluster\"}[5m]))",
830+
"expr": "sum (irate(ceph_osd_op_r{cluster=\"$cluster\"}[5m]))",
831831
"format": "time_series",
832832
"instant": true,
833833
"interval": "$interval",
@@ -895,7 +895,7 @@
895895
"pluginVersion": "7.0.3",
896896
"targets": [
897897
{
898-
"expr": "sum without (instance) (ceph_cluster_total_used_bytes{cluster=\"$cluster\"})",
898+
"expr": "sum (ceph_cluster_total_used_bytes{cluster=\"$cluster\"})",
899899
"format": "time_series",
900900
"instant": true,
901901
"interval": "$interval",
@@ -968,7 +968,7 @@
968968
"pluginVersion": "7.0.3",
969969
"targets": [
970970
{
971-
"expr": "sum without (instance, ceph_daemon) (ceph_mon_num_sessions{cluster='$cluster'})",
971+
"expr": "sum (ceph_mon_num_sessions{cluster='$cluster'})",
972972
"format": "time_series",
973973
"interval": "",
974974
"intervalFactor": 1,
@@ -1435,7 +1435,7 @@
14351435
"pluginVersion": "7.0.3",
14361436
"targets": [
14371437
{
1438-
"expr": "avg without (instance, ceph_daemon) (ceph_osd_numpg{cluster=\"$cluster\"})",
1438+
"expr": "avg (ceph_osd_numpg{cluster=\"$cluster\"})",
14391439
"format": "time_series",
14401440
"instant": true,
14411441
"interval": "$interval",
@@ -1512,7 +1512,7 @@
15121512
"pluginVersion": "7.0.3",
15131513
"targets": [
15141514
{
1515-
"expr": "avg without (instance, ceph_daemon) (ceph_osd_apply_latency_ms{cluster=\"$cluster\"})",
1515+
"expr": "avg (ceph_osd_apply_latency_ms{cluster=\"$cluster\"})",
15161516
"format": "time_series",
15171517
"instant": true,
15181518
"interval": "$interval",
@@ -1666,7 +1666,7 @@
16661666
"pluginVersion": "7.0.3",
16671667
"targets": [
16681668
{
1669-
"expr": "avg without (instance, ceph_daemon) (rate(ceph_osd_op_w_latency_sum{cluster=\"$cluster\"}[5m]) / rate(ceph_osd_op_w_latency_count{cluster=\"$cluster\"}[5m]) >= 0)",
1669+
"expr": "avg (rate(ceph_osd_op_w_latency_sum{cluster=\"$cluster\"}[5m]) / rate(ceph_osd_op_w_latency_count{cluster=\"$cluster\"}[5m]) >= 0)",
16701670
"format": "time_series",
16711671
"instant": false,
16721672
"interval": "",
@@ -1742,7 +1742,7 @@
17421742
"pluginVersion": "7.0.3",
17431743
"targets": [
17441744
{
1745-
"expr": "avg without (instance, ceph_daemon) (rate(ceph_osd_op_r_latency_sum{cluster=\"$cluster\"}[5m])/rate(ceph_osd_op_r_latency_count{cluster=\"$cluster\"}[5m]) >= 0)",
1745+
"expr": "avg (rate(ceph_osd_op_r_latency_sum{cluster=\"$cluster\"}[5m])/rate(ceph_osd_op_r_latency_count{cluster=\"$cluster\"}[5m]) >= 0)",
17461746
"format": "time_series",
17471747
"instant": true,
17481748
"interval": "",
@@ -4367,15 +4367,15 @@
43674367
"steppedLine": false,
43684368
"targets": [
43694369
{
4370-
"expr": "avg without (instance,ceph_daemon) (rate(ceph_osd_op_r_latency_sum{cluster=\"$cluster\"}[5m]) / rate(ceph_osd_op_r_latency_count{cluster=\"$cluster\"}[5m]) >= 0)",
4370+
"expr": "avg (rate(ceph_osd_op_r_latency_sum{cluster=\"$cluster\"}[5m]) / rate(ceph_osd_op_r_latency_count{cluster=\"$cluster\"}[5m]) >= 0)",
43714371
"format": "time_series",
43724372
"interval": "",
43734373
"intervalFactor": 1,
43744374
"legendFormat": "read",
43754375
"refId": "A"
43764376
},
43774377
{
4378-
"expr": "avg without (instance, ceph_daemon) (rate(ceph_osd_op_w_latency_sum{cluster=\"$cluster\"}[5m]) / rate(ceph_osd_op_w_latency_count{cluster=\"$cluster\"}[5m]) >= 0)",
4378+
"expr": "avg (rate(ceph_osd_op_w_latency_sum{cluster=\"$cluster\"}[5m]) / rate(ceph_osd_op_w_latency_count{cluster=\"$cluster\"}[5m]) >= 0)",
43794379
"format": "time_series",
43804380
"interval": "",
43814381
"intervalFactor": 1,

‎rook/helmfile.d/values/podsecuritypolicies.yaml.gotmpl‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,31 @@ constraints:
9797
runAsUser: 167
9898
fsGroup: 167
9999

100+
exporter:
101+
podSelectorLabels:
102+
app: rook-ceph-exporter
103+
allow:
104+
allowPrivilegeEscalation: true
105+
privileged: true
106+
volumes:
107+
- hostPath
108+
- projected
109+
- secret
110+
allowedHostPaths:
111+
- pathPrefix: /var/lib/rook/exporter
112+
- pathPrefix: /var/lib/rook/rook-ceph/crash
113+
- pathPrefix: /var/lib/rook/rook-ceph/log
114+
runAsUser:
115+
rule: RunAsAny
116+
runAsGroup:
117+
rule: RunAsAny
118+
supplementalGroups:
119+
rule: RunAsAny
120+
fsGroup:
121+
rule: RunAsAny
122+
mutation:
123+
dropAllCapabilities: false
124+
100125
mgr:
101126
podSelectorLabels:
102127
app: rook-ceph-mgr

0 commit comments

Comments
 (0)