Skip to content

Commit 474d35d

Browse files
committed
update monitor systemd services template
1 parent 6983289 commit 474d35d

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

roles/monitor/tasks/install.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
when: exporter_install == 'binary'
3838
block:
3939
- name: Copy node_exporter binary
40-
copy: src=node_exporter dest=/usr/bin/node_exporter
40+
copy: src=node_exporter dest=/usr/bin/node_exporter owner=root mode=0755
4141

4242
- name: Copy pg_exporter binary
43-
copy: src=pg_exporter dest=/usr/bin/pg_exporter
43+
copy: src=pg_exporter dest=/usr/bin/pg_exporter owner=root mode=0755
4444
...

roles/monitor/templates/node_exporter.service.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Restart=on-failure
1212
RestartSec=5s
1313

1414
CPUQuota=30%
15-
#MemoryMax=200M
15+
MemoryLimit=200M
1616

1717
[Install]
1818
WantedBy=multi-user.target

roles/monitor/templates/pg_exporter.service.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Restart=on-failure
1212
RestartSec=5s
1313

1414
CPUQuota=10%
15-
MemoryMax=200M
15+
MemoryLimit=200M
1616

1717
[Install]
1818
WantedBy=multi-user.target

roles/monitor/templates/pgbouncer_exporter.service.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Restart=on-failure
1212
RestartSec=5s
1313

1414
CPUQuota=10%
15-
MemoryMax=100M
15+
MemoryLimit=100M
1616

1717
[Install]
1818
WantedBy=multi-user.target

roles/monitor/templates/svc-node-exporter.json.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"type": "exporter",
1212
"role": "{{ pg_role }}",
1313
"seq": "{{ pg_seq }}",
14-
"instance": "{{ pg_instance }}",
15-
"service": "{{ pg_service }}",
14+
"instance": "{{ pg_cluster }}-{{ pg_seq }}",
15+
"service": "{{ pg_cluster }}-{{ pg_role }}",
1616
"cluster": "{{ pg_cluster }}"
1717
},
1818
"check": {

roles/monitor/templates/svc-pg-exporter.json.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"type": "exporter",
1212
"role": "{{ pg_role }}",
1313
"seq": "{{ pg_seq }}",
14-
"instance": "{{ pg_instance }}",
15-
"service": "{{ pg_service }}",
14+
"instance": "{{ pg_cluster }}-{{ pg_seq }}",
15+
"service": "{{ pg_cluster }}-{{ pg_role }}",
1616
"cluster": "{{ pg_cluster }}"
1717
},
1818
"check": {

roles/monitor/templates/svc-pgbouncer-exporter.json.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"type": "exporter",
1212
"role": "{{ pg_role }}",
1313
"seq": "{{ pg_seq }}",
14-
"instance": "{{ pg_instance }}",
15-
"service": "{{ pg_service }}",
14+
"instance": "{{ pg_cluster }}-{{ pg_seq }}",
15+
"service": "{{ pg_cluster }}-{{ pg_role }}",
1616
"cluster": "{{ pg_cluster }}"
1717
},
1818
"check": {

0 commit comments

Comments
 (0)