Skip to content

Commit 3d5d249

Browse files
authored
Enable carbonapi k8 deployment (#157)
Enable carbonapi k8 deployment Reviewed-by: None <None> Reviewed-by: kucerakk <[email protected]>
1 parent 5803b18 commit 3d5d249

File tree

17 files changed

+283
-48
lines changed

17 files changed

+283
-48
lines changed
Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
# TODO: This should be better constructed from existing inventory
2-
carbonapi_backends:
3-
- groupName: "apimon"
4-
lbMethod: "any"
5-
protocol: "carbonapi_v3_pb"
6-
servers:
7-
- "http://192.168.191.55:8081"
8-
- "http://192.168.14.159:8081"
9-
- "http://192.168.151.11:8081"
10-
- groupName: "zuul"
11-
lbMethod: "broadcast"
12-
protocol: "carbonapi_v3_pb"
13-
servers:
14-
- "http://192.168.14.241:8081"
15-
2+
carbonapi_instances:
3+
main:
4+
fqdn: "graphite-ca.eco.tsi-dev.otc-service.com"
5+
carbonapi_cert: "graphite"
6+
backends:
7+
- groupName: "apimon"
8+
lbMethod: "any"
9+
protocol: "carbonapi_v3_pb"
10+
servers:
11+
- "http://192.168.191.55:8081"
12+
- "http://192.168.14.159:8081"
13+
- "http://192.168.151.11:8081"
14+
- groupName: "zuul"
15+
lbMethod: "broadcast"
16+
protocol: "carbonapi_v3_pb"
17+
servers:
18+
- "http://192.168.14.241:8081"
19+
memcache_hosts:
20+
- "192.168.191.55:11211"
21+
- "192.168.14.159:11211"
22+
- "192.168.151.11:11211"

inventory/service/group_vars/k8s-controller.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,14 @@ graphite_web_k8s_instances:
2020
context: "otcinfra-mirror"
2121
instance: "apimon"
2222
namespace: "graphite"
23+
24+
carbonapi_k8s_instances:
25+
- carbonapi_instance: "main"
26+
context: "otcinfra"
27+
instance: "main"
28+
namespace: "graphite"
29+
- carbonapi_instance: "main"
30+
context: "otcinfra-mirror"
31+
instance: "main"
32+
namespace: "graphite"
33+

inventory/service/group_vars/proxy.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,15 @@ proxy_backends:
1919
address: "192.168.151.11:443"
2020
opts: "ssl verify none cookie graphite3 check sni req.hdr(Host)"
2121

22-
- name: "graphite-apimon2"
22+
- name: "graphite-ca"
2323
options:
24-
# NOTE: try to perform simliest query
25-
- "httpchk HEAD /metrics/find/?query=*"
24+
- "httpchk HEAD /metrics/lb_check"
2625
domain_names:
27-
- "graphite.apimon.eco.tsi-dev.otc-service.com"
26+
- "graphite-ca.eco.tsi-dev.otc-service.com"
2827
servers:
29-
- name: "graphite-proxy1"
30-
address: "192.168.110.160:8082"
31-
opts: "verify none cookie graphite1 check sni req.hdr(Host)"
28+
- name: "graphite-otcinfra"
29+
address: "192.168.170.249:443"
30+
opts: "ssl verify none cookie graphite-otcinfra check sni req.hdr(Host)"
3231
- name: "graphite-proxy2"
3332
address: "192.168.110.151:8082"
3433
opts: "verify none cookie graphite2 check sni req.hdr(Host)"

inventory/service/groups.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ groups:
8585
- graphite1.eco.tsi-dev.otc-service.com
8686

8787
carbonapi:
88-
- proxy1.eco.tsi-dev.otc-service.com
88+
- bridge.eco.tsi-dev.otc-service.com
8989
- proxy2.eco.tsi-dev.otc-service.com
9090
- web3.eco.tsi-dev.otc-service.com
9191

inventory/service/host_vars/bridge.eco.tsi-dev.otc-service.com.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@ ssl_certs:
2020
- "swift.eco.tsi-dev.otc-service.com"
2121
graphite-apimon:
2222
- "graphite.apimon.eco.tsi-dev.otc-service.com"
23+
graphite:
24+
- "graphite-ca.eco.tsi-dev.otc-service.com"

inventory/service/host_vars/proxy1.eco.tsi-dev.otc-service.com.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ ssl_certs:
66
- "apimon.eco.tsi-dev.otc-service.com"
77
- "alerts.eco.tsi-dev.otc-service.com"
88
- "graphite.eco.tsi-dev.otc-service.com"
9+
- "graphite-ca.eco.tsi-dev.otc-service.com"
910
- "influx1.eco.tsi-dev.otc-service.com"
1011

1112
firewalld_extra_services_enable: ['http', 'https']
13+
14+
carbonapi_instance: "main"

inventory/service/host_vars/proxy2.eco.tsi-dev.otc-service.com.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ ssl_certs:
66
- "apimon.eco.tsi-dev.otc-service.com"
77
- "alerts.eco.tsi-dev.otc-service.com"
88
- "graphite.eco.tsi-dev.otc-service.com"
9+
- "graphite-ca.eco.tsi-dev.otc-service.com"
910
- "influx1.eco.tsi-dev.otc-service.com"
1011

1112
firewalld_extra_services_enable: ['http', 'https']
13+
14+
carbonapi_instance: "main"

inventory/service/host_vars/web3.eco.tsi-dev.otc-service.com.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@ ssl_certs:
1212
- "alerts.eco.tsi-dev.otc-service.com"
1313
graphite:
1414
- "graphite.eco.tsi-dev.otc-service.com"
15+
- "graphite-ca.eco.tsi-dev.otc-service.com"
1516
- "graphite.apimon.eco.tsi-dev.otc-service.com"
1617

1718
graphite_instance_group: "graphite-apimon"
1819
graphite_cert: "graphite"
1920

2021
firewalld_extra_services_enable: ['http', 'https']
2122
firewalld_extra_ports_enable: ['3000/tcp', '8080/tcp', '8081/tcp']
23+
24+
carbonapi_instance: "main"

playbooks/roles/acme_request_certs/tasks/acme.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
cert: "{{ certs_path }}/{{ cert.key }}.crt"
1111
challenge: "dns-01"
1212
remaining_days: 60
13+
force: "{{ csr_result is changed }}"
1314
register: challenge
1415

1516
- name: Save acme challenge

playbooks/roles/acme_request_certs/tasks/common.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99
privatekey_path: "{{ certs_path }}/{{ cert.key }}.pem"
1010
common_name: "{{ cert.value[0] }}"
1111
subject_alt_name: "DNS:{{ cert.value | join(',DNS:') }}"
12+
register: csr_result

0 commit comments

Comments
 (0)