Skip to content

Commit b80265e

Browse files
EZ4BRUCEEZ4BRUCE
authored
feat(): update opensource to 1.0.9.alpha and support vmmetrics (#27)
1 parent b57341b commit b80265e

File tree

7 files changed

+396
-4
lines changed

7 files changed

+396
-4
lines changed

‎Tiltfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ def deploy_ob_private():
6565
if command == 'moc':
6666
deploy_minio()
6767
deploy_moc_ob()
68+
elif command == 'ob-single':
69+
deploy_moc_ob()
6870
elif command == 'private':
6971
deploy_minio()
7072
deploy_ob_private()

‎charts/mo-ob-opensource/Chart.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: mo-ob-opensource
33
description: mo-ob-opensource's Helm chart for Kubernetes
44
type: application
5-
version: 1.0.8
5+
version: 1.0.9-alpha
66
appVersion: 0.9.0
77
dependencies:
88
- condition: kube-prometheus-stack.enabled
@@ -21,3 +21,7 @@ dependencies:
2121
name: alloy
2222
repository: https://grafana.github.io/helm-charts
2323
version: 0.6.1
24+
- condition: victoria-metrics-k8s-stack.enabled
25+
name: victoria-metrics-k8s-stack
26+
repository: https://victoriametrics.github.io/helm-charts
27+
version: 0.33.0

‎charts/mo-ob-opensource/templates/vm-datasource.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
name: mo-vm-datasource
5+
labels:
6+
app: victoriametrics
7+
grafana_datasource: "1"
8+
data:
9+
vm-datasource.yaml: |-
10+
apiVersion: 1
11+
datasources:
12+
- name: MO-VictoriaMetrics
13+
type: prometheus
14+
uid: victoriametrics
15+
url: http://vmsingle-{{ .Release.Name }}-victoria-metrics-k8s-stack:8429
16+
access: proxy

‎charts/mo-ob-opensource/templates/vmagent/ob-scrape-config.yaml

Lines changed: 173 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
apiVersion: v1
2+
kind: Secret
3+
metadata:
4+
name: vm-additional-scrape-configs
5+
stringData:
6+
prometheus-additional.yaml: |
7+
- job_name: 'kubernetes-service-endpoints'
8+
honor_labels: true
9+
kubernetes_sd_configs:
10+
- role: endpoints
11+
relabel_configs:
12+
- source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape]
13+
action: keep
14+
regex: true
15+
- source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape_slow]
16+
action: drop
17+
regex: true
18+
- source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme]
19+
action: replace
20+
target_label: __scheme__
21+
regex: (https?)
22+
- source_labels: [__meta_kubernetes_service_annotation_prometheus_io_path]
23+
action: replace
24+
target_label: __metrics_path__
25+
regex: (.+)
26+
- source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port]
27+
action: replace
28+
target_label: __address__
29+
regex: (.+?)(?::\d+)?;(\d+)
30+
replacement: $1:$2
31+
- action: labelmap
32+
regex: __meta_kubernetes_service_annotation_prometheus_io_param_(.+)
33+
replacement: __param_$1
34+
- action: labelmap
35+
regex: __meta_kubernetes_pod_label_(.+)
36+
- action: labelmap
37+
regex: __meta_kubernetes_service_label_(.+)
38+
- source_labels: [__meta_kubernetes_namespace]
39+
action: replace
40+
target_label: namespace
41+
- source_labels: [__meta_kubernetes_service_name]
42+
action: replace
43+
target_label: service
44+
- source_labels: [__meta_kubernetes_pod_node_name]
45+
action: replace
46+
target_label: node
47+
- source_labels: [__meta_kubernetes_pod_name]
48+
action: replace
49+
target_label: pod
50+
51+
# Scrape config for slow service endpoints; same as above, but with a larger
52+
# timeout and a larger interval
53+
#
54+
# The relabeling allows the actual service scrape endpoint to be configured
55+
# via the following annotations:
56+
#
57+
# * `prometheus.io/scrape-slow`: Only scrape services that have a value of `true`
58+
# * `prometheus.io/scheme`: If the metrics endpoint is secured then you will need
59+
# to set this to `https` & most likely set the `tls_config` of the scrape config.
60+
# * `prometheus.io/path`: If the metrics path is not `/metrics` override this.
61+
# * `prometheus.io/port`: If the metrics are exposed on a different port to the
62+
# service then set this appropriately.
63+
# * `prometheus.io/param_<parameter>`: If the metrics endpoint uses parameters
64+
# then you can set any parameter
65+
- job_name: 'kubernetes-service-endpoints-slow'
66+
honor_labels: true
67+
68+
scrape_interval: 5m
69+
scrape_timeout: 30s
70+
71+
kubernetes_sd_configs:
72+
- role: endpoints
73+
74+
relabel_configs:
75+
- source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape_slow]
76+
action: keep
77+
regex: true
78+
- source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme]
79+
action: replace
80+
target_label: __scheme__
81+
regex: (https?)
82+
- source_labels: [__meta_kubernetes_service_annotation_prometheus_io_path]
83+
action: replace
84+
target_label: __metrics_path__
85+
regex: (.+)
86+
- source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port]
87+
action: replace
88+
target_label: __address__
89+
regex: (.+?)(?::\d+)?;(\d+)
90+
replacement: $1:$2
91+
- action: labelmap
92+
regex: __meta_kubernetes_service_annotation_prometheus_io_param_(.+)
93+
replacement: __param_$1
94+
- action: labelmap
95+
regex: __meta_kubernetes_pod_label_(.+)
96+
- action: labelmap
97+
regex: __meta_kubernetes_service_label_(.+)
98+
- source_labels: [__meta_kubernetes_namespace]
99+
action: replace
100+
target_label: namespace
101+
- source_labels: [__meta_kubernetes_service_name]
102+
action: replace
103+
target_label: service
104+
- source_labels: [__meta_kubernetes_pod_node_name]
105+
action: replace
106+
target_label: node
107+
- source_labels: [__meta_kubernetes_pod_name]
108+
action: replace
109+
target_label: pod
110+
111+
- job_name: "moob-application"
112+
honor_labels: true
113+
kubernetes_sd_configs:
114+
- role: endpoints
115+
relabel_configs:
116+
- action: keep
117+
regex: "mo-ob"
118+
source_labels:
119+
- __meta_kubernetes_namespace
120+
- source_labels:
121+
- __meta_kubernetes_endpoints_label_need_metrics
122+
action: keep
123+
regex: true
124+
- action: labelmap
125+
regex: __meta_kubernetes_pod_label_(.+)
126+
- action: labelmap
127+
regex: __meta_kubernetes_endpoints_label_(.+)
128+
- action: replace
129+
source_labels:
130+
- __meta_kubernetes_namespace
131+
target_label: namespace
132+
- action: replace
133+
source_labels:
134+
- __meta_kubernetes_service_name
135+
target_label: service
136+
- action: replace
137+
source_labels:
138+
- __meta_kubernetes_pod_node_name
139+
target_label: node
140+
- action: replace
141+
source_labels: [__meta_kubernetes_pod_name]
142+
target_label: pod
143+
- job_name: "matrixone-cn-pods"
144+
honor_labels: true
145+
kubernetes_sd_configs:
146+
- role: pod
147+
relabel_configs:
148+
- source_labels: [__meta_kubernetes_pod_labelpresent_matrixorigin_io_component]
149+
action: keep
150+
regex: true
151+
- source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
152+
action: keep
153+
regex: "true"
154+
- source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path]
155+
action: replace
156+
target_label: __metrics_path__
157+
regex: (.+)
158+
- source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
159+
action: replace
160+
target_label: __address__
161+
regex: (.+?)(?::\d+)?;(\d+)
162+
replacement: $1:$2
163+
- action: labelmap
164+
regex: __meta_kubernetes_pod_label_(.+)
165+
- source_labels: [__meta_kubernetes_namespace]
166+
action: replace
167+
target_label: namespace
168+
- source_labels: [__meta_kubernetes_pod_node_name]
169+
action: replace
170+
target_label: node
171+
- source_labels: [__meta_kubernetes_pod_name]
172+
action: replace
173+
target_label: pod

0 commit comments

Comments
 (0)