Skip to content

Commit 2fa8d30

Browse files
HeleneHelene
authored
Merge pull request #290 from Helene/openshift_monitoring
Example scripts for monitoring user defined projects on Openshift
2 parents 1352b04 + 1c3bc94 commit 2fa8d30

File tree

3 files changed

+209
-0
lines changed

3 files changed

+209
-0
lines changed

‎examples/openshift_deployment_scripts/cnsa_workload_monitoring/README.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Example setting up Openshift metrics collection for ibm-spectrum-scale project
2+
3+
4+
5+
Using the scripts in this folder you can expose CNSA(gpfs) internal metrics to the Openshift Monitoring Stack
6+
7+
```shell
8+
oc apply -f cluster_monitoring_config.yml
9+
```
10+
11+
```shell
12+
oc label namespace openshift-user-workload-monitoring scale.spectrum.ibm.com/networkpolicy=allow
13+
```
14+
15+
```shell
16+
NAMESPACE=ibm-spectrum-scale
17+
```
18+
19+
```shell
20+
oc apply -f grafana_bridge_service_monitor.yaml --namespace=$NAMESPACE
21+
```
22+
23+

‎examples/openshift_deployment_scripts/cnsa_workload_monitoring/cluster_monitoring_config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
name: cluster-monitoring-config
5+
namespace: openshift-monitoring
6+
data:
7+
config.yaml: |
8+
enableUserWorkload: true

‎examples/openshift_deployment_scripts/cnsa_workload_monitoring/grafana_bridge_service_monitor.yaml

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
apiVersion: monitoring.coreos.com/v1
2+
kind: ServiceMonitor
3+
metadata:
4+
labels:
5+
app.kubernetes.io/instance: ibm-spectrum-scale
6+
app.kubernetes.io/name: grafanabridge
7+
name: prometheus-grafanabridge-monitor
8+
namespace: ibm-spectrum-scale
9+
spec:
10+
endpoints:
11+
- honorTimestamps: true
12+
interval: 10s
13+
path: /metrics_gpfs_filesystem
14+
port: prometheus
15+
scheme: https
16+
tlsConfig:
17+
ca:
18+
configMap:
19+
key: service-ca.crt
20+
name: ibm-spectrum-scale-cabundle
21+
cert:
22+
secret:
23+
key: tls.crt
24+
name: ibm-spectrum-scale-grafana-bridge-service-cert
25+
keySecret:
26+
key: tls.key
27+
name: ibm-spectrum-scale-grafana-bridge-service-cert
28+
serverName: ibm-spectrum-scale-grafana-bridge.ibm-spectrum-scale.svc
29+
- honorTimestamps: true
30+
interval: 300s
31+
path: /metrics_gpfs_pool
32+
port: prometheus
33+
scheme: https
34+
tlsConfig:
35+
ca:
36+
configMap:
37+
key: service-ca.crt
38+
name: ibm-spectrum-scale-cabundle
39+
cert:
40+
secret:
41+
key: tls.crt
42+
name: ibm-spectrum-scale-grafana-bridge-service-cert
43+
keySecret:
44+
key: tls.key
45+
name: ibm-spectrum-scale-grafana-bridge-service-cert
46+
serverName: ibm-spectrum-scale-grafana-bridge.ibm-spectrum-scale.svc
47+
- honorTimestamps: true
48+
interval: 300s
49+
path: /metrics_gpfs_fileset
50+
port: prometheus
51+
scheme: https
52+
tlsConfig:
53+
ca:
54+
configMap:
55+
key: service-ca.crt
56+
name: ibm-spectrum-scale-cabundle
57+
cert:
58+
secret:
59+
key: tls.crt
60+
name: ibm-spectrum-scale-grafana-bridge-service-cert
61+
keySecret:
62+
key: tls.key
63+
name: ibm-spectrum-scale-grafana-bridge-service-cert
64+
serverName: ibm-spectrum-scale-grafana-bridge.ibm-spectrum-scale.svc
65+
- honorTimestamps: true
66+
interval: 28800s
67+
path: /metrics_gpfs_diskcap
68+
port: prometheus
69+
scheme: https
70+
tlsConfig:
71+
ca:
72+
configMap:
73+
key: service-ca.crt
74+
name: ibm-spectrum-scale-cabundle
75+
cert:
76+
secret:
77+
key: tls.crt
78+
name: ibm-spectrum-scale-grafana-bridge-service-cert
79+
keySecret:
80+
key: tls.key
81+
name: ibm-spectrum-scale-grafana-bridge-service-cert
82+
serverName: ibm-spectrum-scale-grafana-bridge.ibm-spectrum-scale.svc
83+
- honorTimestamps: true
84+
interval: 3600s
85+
path: /metrics_gpfs_filesetquota
86+
port: prometheus
87+
scheme: https
88+
tlsConfig:
89+
ca:
90+
configMap:
91+
key: service-ca.crt
92+
name: ibm-spectrum-scale-cabundle
93+
cert:
94+
secret:
95+
key: tls.crt
96+
name: ibm-spectrum-scale-grafana-bridge-service-cert
97+
keySecret:
98+
key: tls.key
99+
name: ibm-spectrum-scale-grafana-bridge-service-cert
100+
serverName: ibm-spectrum-scale-grafana-bridge.ibm-spectrum-scale.svc
101+
- honorTimestamps: true
102+
interval: 10s
103+
path: /metrics_gpfs_afm
104+
port: prometheus
105+
scheme: https
106+
tlsConfig:
107+
ca:
108+
configMap:
109+
key: service-ca.crt
110+
name: ibm-spectrum-scale-cabundle
111+
cert:
112+
secret:
113+
key: tls.crt
114+
name: ibm-spectrum-scale-grafana-bridge-service-cert
115+
keySecret:
116+
key: tls.key
117+
name: ibm-spectrum-scale-grafana-bridge-service-cert
118+
serverName: ibm-spectrum-scale-grafana-bridge.ibm-spectrum-scale.svc
119+
- honorTimestamps: true
120+
interval: 10s
121+
path: /metrics_gpfs_afmfs
122+
port: prometheus
123+
scheme: https
124+
tlsConfig:
125+
ca:
126+
configMap:
127+
key: service-ca.crt
128+
name: ibm-spectrum-scale-cabundle
129+
cert:
130+
secret:
131+
key: tls.crt
132+
name: ibm-spectrum-scale-grafana-bridge-service-cert
133+
keySecret:
134+
key: tls.key
135+
name: ibm-spectrum-scale-grafana-bridge-service-cert
136+
serverName: ibm-spectrum-scale-grafana-bridge.ibm-spectrum-scale.svc
137+
- honorTimestamps: true
138+
interval: 10s
139+
path: /metrics_gpfs_afmfset
140+
port: prometheus
141+
scheme: https
142+
tlsConfig:
143+
ca:
144+
configMap:
145+
key: service-ca.crt
146+
name: ibm-spectrum-scale-cabundle
147+
cert:
148+
secret:
149+
key: tls.crt
150+
name: ibm-spectrum-scale-grafana-bridge-service-cert
151+
keySecret:
152+
key: tls.key
153+
name: ibm-spectrum-scale-grafana-bridge-service-cert
154+
serverName: ibm-spectrum-scale-grafana-bridge.ibm-spectrum-scale.svc
155+
- honorTimestamps: true
156+
interval: 30s
157+
path: /metrics_gpfs_mmhealth
158+
port: prometheus
159+
scheme: https
160+
tlsConfig:
161+
ca:
162+
configMap:
163+
key: service-ca.crt
164+
name: ibm-spectrum-scale-cabundle
165+
cert:
166+
secret:
167+
key: tls.crt
168+
name: ibm-spectrum-scale-grafana-bridge-service-cert
169+
keySecret:
170+
key: tls.key
171+
name: ibm-spectrum-scale-grafana-bridge-service-cert
172+
serverName: ibm-spectrum-scale-grafana-bridge.ibm-spectrum-scale.svc
173+
selector:
174+
matchLabels:
175+
app.kubernetes.io/instance: ibm-spectrum-scale
176+
app.kubernetes.io/name: grafanabridge
177+
178+

0 commit comments

Comments
 (0)