Skip to content

Commit a3cd1bc

Browse files
duanhongyiduanhongyi
committed
chore(monitor): monitoring nsqd and redis separately
1 parent cb3dfac commit a3cd1bc

9 files changed

Lines changed: 124 additions & 50 deletions

‎charts/monitor/templates/monitor-grafana-deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ spec:
6060
key: password
6161
{{- else }}
6262
- name: "INFLUXDB_URLS"
63-
value: http://$(DRYCC_MONITOR_INFLUXDB_API_SERVICE_HOST):$(DRYCC_MONITOR_INFLUXDB_API_SERVICE_PORT_TRANSPORT)
63+
value: http://$(DRYCC_MONITOR_INFLUXDB_SERVICE_HOST):$(DRYCC_MONITOR_INFLUXDB_SERVICE_PORT_TRANSPORT)
6464
{{- end }}
6565
- name: "BIND_PORT"
6666
value: "3500"

‎charts/monitor/templates/monitor-grafana-ingress.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: networking.k8s.io/v1beta1
22
kind: Ingress
33
metadata:
4-
name: "drycc-monitor-grafana-ingress"
4+
name: "drycc-monitor-grafana"
55
labels:
66
app: "drycc-monitor-grafana"
77
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"

charts/monitor/templates/monitor-influxdb-api-certificate.yaml renamed to charts/monitor/templates/monitor-influxdb-certificate.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
apiVersion: cert-manager.io/v1alpha2
33
kind: Certificate
44
metadata:
5-
name: drycc-monitor-influxdb-api
5+
name: drycc-monitor-influxdb
66
spec:
7-
secretName: drycc-monitor-influxdb-api-auto-tls
7+
secretName: drycc-monitor-influxdb-auto-tls
88
issuerRef:
99
name: drycc-cluster-issuer
1010
kind: ClusterIssuer
1111
dnsNames:
12-
- drycc-monitor-influxdb-api.{{ .Values.global.platform_domain }}
12+
- drycc-monitor-influxdb.{{ .Values.global.platform_domain }}
1313
privateKey:
1414
rotationPolicy: Always
1515
{{- end }}

charts/monitor/templates/monitor-influxdb-api-ingress.yaml renamed to charts/monitor/templates/monitor-influxdb-ingress.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: networking.k8s.io/v1beta1
22
kind: Ingress
33
metadata:
4-
name: "drycc-monitor-influxdb-api-ingress"
4+
name: "drycc-monitor-influxdb"
55
labels:
6-
app: "drycc-monitor-influxdb-api"
6+
app: "drycc-monitor-influxdb"
77
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
88
release: "{{ .Release.Name }}"
99
heritage: "{{ .Release.Service }}"
@@ -14,7 +14,7 @@ metadata:
1414
{{ end }}
1515
spec:
1616
rules:
17-
- host: drycc-monitor-influxdb-api.{{ .Values.global.platform_domain }}
17+
- host: drycc-monitor-influxdb.{{ .Values.global.platform_domain }}
1818
http:
1919
paths:
2020
{{- if eq .Values.global.ingress_class "gce" "alb" }}
@@ -23,11 +23,11 @@ spec:
2323
- path: /
2424
{{- end }}
2525
backend:
26-
serviceName: drycc-monitor-influxdb-api
26+
serviceName: drycc-monitor-influxdb
2727
servicePort: 80
2828
{{ if .Values.global.cert_manager_enabled }}
2929
tls:
30-
- secretName: drycc-monitor-influxdb-api-auto-tls
30+
- secretName: drycc-monitor-influxdb-auto-tls
3131
hosts:
32-
- drycc-monitor-influxdb-api.{{ .Values.global.platform_domain }}
32+
- drycc-monitor-influxdb.{{ .Values.global.platform_domain }}
3333
{{- end }}

charts/monitor/templates/monitor-influxdb-api-svc.yaml renamed to charts/monitor/templates/monitor-influxdb-svc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
apiVersion: v1
33
kind: Service
44
metadata:
5-
name: drycc-monitor-influxdb-api
5+
name: drycc-monitor-influxdb
66
labels:
77
heritage: drycc
8-
app: drycc-monitor-influxdb-api
8+
app: drycc-monitor-influxdb
99
spec:
1010
ports:
1111
- port: 80

‎charts/monitor/templates/monitor-telegraf-daemon.yaml‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
{{ $nsqdNodeCount := .Values.nsqd.replicas | int }}
2-
{{ $redisNodeCount := .Values.redis.replicas | int }}
31
apiVersion: apps/v1
42
kind: DaemonSet
53
metadata:
@@ -64,11 +62,7 @@ spec:
6462
key: password
6563
{{- else }}
6664
- name: "INFLUXDB_URLS"
67-
value: "\"http://$(DRYCC_MONITOR_INFLUXDB_API_SERVICE_HOST):$(DRYCC_MONITOR_INFLUXDB_API_SERVICE_PORT_TRANSPORT)\""
68-
- name: "INFLUXDB_INPUT_URLS"
69-
value: "\"http://$(DRYCC_MONITOR_INFLUXDB_API_SERVICE_HOST):$(DRYCC_MONITOR_INFLUXDB_API_SERVICE_PORT_TRANSPORT)/debug/vars\""
70-
- name: "ENABLE_INFLUXDB_INPUT"
71-
value: "true"
65+
value: "\"http://$(DRYCC_MONITOR_INFLUXDB_SERVICE_HOST):$(DRYCC_MONITOR_INFLUXDB_SERVICE_PORT_TRANSPORT)\""
7266
{{- end }}
7367
- name: "HOST_PROC"
7468
value: "/rootfs/proc"
@@ -80,21 +74,8 @@ spec:
8074
value: "100000"
8175
- name: "ENABLE_KUBERNETES"
8276
value: "true"
83-
- name: "NSQ_CONSUMER_SERVERS"
84-
value: "[{{range $i := until $nsqdNodeCount}}\"drycc-nsqd-{{$i}}.drycc-nsqd.{{ $.Release.Namespace }}.svc.cluster.local:{{$.Values.nsqd.tcp_port}}\"{{if lt (add 1 $i) $nsqdNodeCount}}, {{end}}{{end}}]"
85-
- name: "NSQ_CONSUMER_TOPIC"
86-
value: "metrics"
87-
- name: "NSQ_ENDPOINTS"
88-
value: "[{{range $i := until $nsqdNodeCount}}\"http://drycc-nsqd-{{$i}}.drycc-nsqd.{{ $.Release.Namespace }}.svc.cluster.local:{{$.Values.nsqd.http_port}}\"{{if lt (add 1 $i) $nsqdNodeCount}}, {{end}}{{end}}]"
89-
{{- if ne .Values.global.logger_redis_location "off-cluster" }}
90-
- name: DRYCC_LOGGER_REDIS_PASSWORD
91-
valueFrom:
92-
secretKeyRef:
93-
name: logger-redis-creds
94-
key: password
95-
- name: "REDIS_SERVERS"
96-
value: "[{{range $i := until $redisNodeCount}}\":$(DRYCC_LOGGER_REDIS_PASSWORD)@drycc-logger-redis-{{$i}}.drycc-logger-redis.{{ $.Release.Namespace }}.svc.cluster.local:{{$.Values.redis.port}}\"{{if lt (add 1 $i) $redisNodeCount}}, {{end}}{{end}}]"
97-
{{- end }}
77+
- name: "ENABLE_BARE_METAL_SERVER"
78+
value: "true"
9879
volumeMounts:
9980
- mountPath: /var/run/docker.sock
10081
name: docker-socket
@@ -107,8 +88,6 @@ spec:
10788
- name: varrunutmpro
10889
mountPath: /var/run/utmp
10990
readOnly: true
110-
- name: logger-redis-creds
111-
mountPath: /var/run/secrets/drycc/redis/creds
11291
volumes:
11392
- name: docker-socket
11493
hostPath:
@@ -121,7 +100,4 @@ spec:
121100
path: /proc
122101
- name: varrunutmpro
123102
hostPath:
124-
path: /var/run/utmp
125-
- name: logger-redis-creds
126-
secret:
127-
secretName: logger-redis-creds
103+
path: /var/run/utmp

‎charts/monitor/templates/monitor-telegraf-deployment.yaml‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
{{ $nsqdNodeCount := .Values.nsqd.replicas | int }}
2+
{{ $redisNodeCount := .Values.redis.replicas | int }}
3+
apiVersion: apps/v1
4+
kind: Deployment
5+
metadata:
6+
name: drycc-monitor-telegraf
7+
labels:
8+
heritage: drycc
9+
annotations:
10+
component.drycc.cc/version: {{ .Values.monitor.telegraf.docker_tag }}
11+
spec:
12+
replicas: 1
13+
selector:
14+
matchLabels:
15+
app: drycc-monitor-telegraf
16+
{{- if ge .Capabilities.KubeVersion.Minor "6" }}
17+
updateStrategy:
18+
type: RollingUpdate
19+
{{- end }}
20+
template:
21+
metadata:
22+
labels:
23+
app: drycc-monitor-telegraf
24+
spec:
25+
serviceAccount: drycc-monitor-telegraf
26+
containers:
27+
- name: drycc-monitor-telegraf
28+
image: {{.Values.monitor.telegraf.docker_registry}}{{.Values.monitor.telegraf.org}}/telegraf:{{.Values.monitor.telegraf.docker_tag}}
29+
imagePullPolicy: {{.Values.monitor.telegraf.pull_policy}}
30+
{{- if or (.Values.monitor.telegraf.limits_cpu) (.Values.monitor.telegraf.limits_memory)}}
31+
resources:
32+
limits:
33+
{{- if (.Values.monitor.telegraf.limits_cpu) }}
34+
cpu: {{.Values.monitor.telegraf.limits_cpu}}
35+
{{- end}}
36+
{{- if (.Values.monitor.telegraf.limits_memory) }}
37+
memory: {{.Values.monitor.telegraf.limits_memory}}
38+
{{- end}}
39+
{{- end}}
40+
env:
41+
- name: POD_NAMESPACE
42+
valueFrom:
43+
fieldRef:
44+
fieldPath: metadata.namespace
45+
{{- if eq .Values.global.influxdb_location "off-cluster" }}
46+
- name: "INFLUXDB_URLS"
47+
valueFrom:
48+
secretKeyRef:
49+
name: influxdb-creds
50+
key: url
51+
- name: "INFLUXDB_DATABASE"
52+
valueFrom:
53+
secretKeyRef:
54+
name: influxdb-creds
55+
key: database
56+
- name: "INFLUXDB_USERNAME"
57+
valueFrom:
58+
secretKeyRef:
59+
name: influxdb-creds
60+
key: user
61+
- name: "INFLUXDB_PASSWORD"
62+
valueFrom:
63+
secretKeyRef:
64+
name: influxdb-creds
65+
key: password
66+
{{- else }}
67+
- name: "INFLUXDB_URLS"
68+
value: "\"http://$(DRYCC_MONITOR_INFLUXDB_SERVICE_HOST):$(DRYCC_MONITOR_INFLUXDB_SERVICE_PORT_TRANSPORT)\""
69+
- name: "INFLUXDB_INPUT_URLS"
70+
value: "\"http://$(DRYCC_MONITOR_INFLUXDB_SERVICE_HOST):$(DRYCC_MONITOR_INFLUXDB_SERVICE_PORT_TRANSPORT)/debug/vars\""
71+
- name: "ENABLE_INFLUXDB_INPUT"
72+
value: "true"
73+
{{- end }}
74+
- name: "AGENT_QUIET"
75+
value: "true"
76+
- name: "AGENT_BUFFER_LIMIT"
77+
value: "100000"
78+
- name: "NSQ_CONSUMER_SERVERS"
79+
value: "[{{range $i := until $nsqdNodeCount}}\"drycc-nsqd-{{$i}}.drycc-nsqd.{{ $.Release.Namespace }}.svc.cluster.local:{{$.Values.nsqd.tcp_port}}\"{{if lt (add 1 $i) $nsqdNodeCount}}, {{end}}{{end}}]"
80+
- name: "NSQ_CONSUMER_TOPIC"
81+
value: "metrics"
82+
- name: "NSQ_ENDPOINTS"
83+
value: "[{{range $i := until $nsqdNodeCount}}\"http://drycc-nsqd-{{$i}}.drycc-nsqd.{{ $.Release.Namespace }}.svc.cluster.local:{{$.Values.nsqd.http_port}}\"{{if lt (add 1 $i) $nsqdNodeCount}}, {{end}}{{end}}]"
84+
{{- if ne .Values.global.logger_redis_location "off-cluster" }}
85+
- name: DRYCC_LOGGER_REDIS_PASSWORD
86+
valueFrom:
87+
secretKeyRef:
88+
name: logger-redis-creds
89+
key: password
90+
- name: "REDIS_SERVERS"
91+
value: "[{{range $i := until $redisNodeCount}}\":$(DRYCC_LOGGER_REDIS_PASSWORD)@drycc-logger-redis-{{$i}}.drycc-logger-redis.{{ $.Release.Namespace }}.svc.cluster.local:{{$.Values.redis.port}}\"{{if lt (add 1 $i) $redisNodeCount}}, {{end}}{{end}}]"
92+
volumeMounts:
93+
- name: logger-redis-creds
94+
mountPath: /var/run/secrets/drycc/redis/creds
95+
volumes:
96+
- name: logger-redis-creds
97+
secret:
98+
secretName: logger-redis-creds
99+
{{- end }}

‎grafana/rootfs/usr/share/grafana/start-grafana‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ GRAFANA_USER=${DEFAULT_USER:-admin}
88
GRAFANA_PASSWD=${DEFAULT_USER_PASSWORD:-admin}
99
GRAFANA_PORT=${BIND_PORT:-3000}
1010

11-
INFLUXDB_HOST=${DRYCC_MONITOR_INFLUXDB_API_SERVICE_HOST:-"drycc-monitor-influxdb-api.drycc.svc.cluster.local"}
12-
INFLUXDB_PORT=${DRYCC_MONITOR_INFLUXDB_API_SERVICE_PORT_TRANSPORT:-8086}
11+
INFLUXDB_HOST=${DRYCC_MONITOR_INFLUXDB_SERVICE_HOST:-"drycc-monitor-influxdb.drycc.svc.cluster.local"}
12+
INFLUXDB_PORT=${DRYCC_MONITOR_INFLUXDB_SERVICE_PORT_TRANSPORT:-8086}
1313
INFLUXDB_DATABASE=${INFLUXDB_DATABASE:-kubernetes}
1414
INFLUXDB_USER=${INFLUXDB_USER:-admin}
1515
INFLUXDB_PASSWORD=${INFLUXDB_PASSWORD:-admin}

‎telegraf/rootfs/config.toml.tpl‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,26 +104,25 @@
104104
{{ end }}
105105

106106
# Set Input Configuration
107+
{{ if .ENABLE_BARE_METAL_SERVER }}
107108
[[inputs.netstat]]
108109
[[inputs.swap]]
109110
[[inputs.system]]
110111
[[inputs.mem]]
111112
[[inputs.cpu]]
112113
percpu = true
113114
totalcpu = true
114-
115-
{{ if .ENABLE_ZFS }}[[inputs.zfs]]{{ end }}
116-
117-
[[inputs.disk]]
118-
{{ if .DISK_MOUNT_POINTS }} mount_points = [{{ .DISK_MOUNT_POINTS }}] {{ end }}
119-
120-
121115
[[inputs.diskio]]
122116
{{ if .DISKIO_DEVICES }} devices = [{{ .DISKIO_DEVICES }}] {{ end }}
123117
{{ if .DISKIO_SKIP_SERIAL_NUMBER }} skip_serial_number = {{ .DISKIO_SKIP_SERIAL_NUMBER }} {{ end }}
124118

125119
[[inputs.net]]
126120
{{ if .NET_INTERFACES }} interfaces = [{{ .NET_INTERFACES}}] {{ end }}
121+
[[inputs.disk]]
122+
{{ if .DISK_MOUNT_POINTS }} mount_points = [{{ .DISK_MOUNT_POINTS }}] {{ end }}
123+
{{ end }}
124+
125+
{{ if .ENABLE_ZFS }}[[inputs.zfs]]{{ end }}
127126

128127
{{ if .APACHE_URLS }}
129128
[[inputs.apache]]

0 commit comments

Comments
 (0)