bootstack-ops

Merge bootstack-ops:prometheus-sprint into bootstack-ops:master

  1. Git
  2. lp:bootstack-ops
  3. prometheus-sprint
  4. Merge into master
Proposed by JuanJo Ciarlante
Status: Rejected
Rejected by: Benjamin Kaehne
Proposed branch: bootstack-ops:prometheus-sprint
Merge into: bootstack-ops:master
Diff against target: 177 lines (+114/-28)
3 files modified
Makefile (+2/-1)
README.md (+7/-2)
ops-bundle.yaml (+105/-25)
Reviewer Review Type Date Requested Status
Alvaro Uria (community) lgtm Approve
Review via email: mp+315219@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alvaro Uria (aluria) :
review: Approve (lgtm)
Revision history for this message
Benjamin Kaehne (ben-kaehne) :
bootstack-ops:prometheus-sprint updated
f417fc4... by JuanJo Ciarlante

Use bootstack-CUSTOMER

Revision history for this message
JuanJo Ciarlante (jjo) :
Revision history for this message
Benjamin Kaehne (ben-kaehne) wrote :

Looks good to merge. Please squash first.

Unmerged commits

f417fc4... by JuanJo Ciarlante

Use bootstack-CUSTOMER

48f7672... by JuanJo Ciarlante

re-Fix README.md

fcbe8bd... by JuanJo Ciarlante

Fix README.md

7fc36b4... by JuanJo Ciarlante

[jjo] add reporting stack (prometheus + grafana + alertmanager) to ops-bundle.yaml

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/Makefile b/Makefile
index 2952592..bc42ed3 100644
--- a/Makefile
+++ b/Makefile
@@ -2,4 +2,5 @@
2PYTHON := /usr/bin/env python2PYTHON := /usr/bin/env python
33
4lint:4lint:
5 yamllint -c .yamllint.config ops-bundle.yaml5 test -x /usr/bin/yamllint && yamllint -c .yamllint.config ops-bundle.yaml || true
6 python -c 'import yaml,sys;yaml.load(sys.stdin)' < ops-bundle.yaml
diff --git a/README.md b/README.md
index 81c4f94..3e7fb67 100644
--- a/README.md
+++ b/README.md
@@ -10,10 +10,15 @@ make lint
1010
11# Contributing Quickstart Guide11# Contributing Quickstart Guide
1212
13git clone git+ssh://git.launchpad.net/~canonical-bootstack/+git/opsbundle13git clone git+ssh://git.launchpad.net/~canonical-bootstack/bootstack-ops/+git/bootstack-ops
14cd bootstack-ops
1415
15git checkout -b myfeature16git checkout -b myfeature
1617
17git push git+ssh://git.launchpad.net/~{YOUR-LP-ACCOUNT}/canonical-bootstack/+git/opsbundle mybranch18<... hack ...>
19
20git commit ...
21
22git push origin myfeature
1823
19Create a MR on LP UI.24Create a MR on LP UI.
diff --git a/ops-bundle.yaml b/ops-bundle.yaml
index 6994893..3321579 100644
--- a/ops-bundle.yaml
+++ b/ops-bundle.yaml
@@ -1,5 +1,12 @@
1config: &OPS_CLUSTER ["lxc:infra=0", "lxc:infra=1", "lxc:infra=2"]1config: &OPS_CLUSTER ["lxc:infra=0", "lxc:infra=1", "lxc:infra=2"]
22
3# reporting: prometheus + grafana + alertmanager stack
4# Because snaps fail inside LXC lp#1611078 (xenial/lxd) lp#1582394 (xenial/lxc),
5# we need a KVM, then we smoosh all services into.
6config: &REPORTING_SVC_TO "reporting=0"
7config: &REGION bootstack-CUSTOMER
8config: &NAGIOS_CONTEXT bootstack-CUSTOMER
9
3logging:10logging:
4 services:11 services:
5 elasticsearch:12 elasticsearch:
@@ -16,28 +23,101 @@ logging:
1623
17 rsyslog-elasticsearch:24 rsyslog-elasticsearch:
18 charm: rsyslog-elasticsearch25 charm: rsyslog-elasticsearch
19 relations:26 relations:
20 - [rsyslog-elasticsearch, elasticsearch]27 - [rsyslog-elasticsearch, elasticsearch]
21 - [rsyslog-elasticsearch, ceilometer]28 - [rsyslog-elasticsearch, ceilometer]
22 - [rsyslog-elasticsearch, cinder]29 - [rsyslog-elasticsearch, cinder]
23 - [rsyslog-elasticsearch, glance]30 - [rsyslog-elasticsearch, glance]
24 - [rsyslog-elasticsearch, glance-simplestreams-sync]31 - [rsyslog-elasticsearch, glance-simplestreams-sync]
25 - [rsyslog-elasticsearch, heat]32 - [rsyslog-elasticsearch, heat]
26 - [rsyslog-elasticsearch, keystone]33 - [rsyslog-elasticsearch, keystone]
27 - [rsyslog-elasticsearch, landscape]34 - [rsyslog-elasticsearch, landscape]
28 - [rsyslog-elasticsearch, landscape-apache]35 - [rsyslog-elasticsearch, landscape-apache]
29 - [rsyslog-elasticsearch, landscape-haproxy]36 - [rsyslog-elasticsearch, landscape-haproxy]
30 - [rsyslog-elasticsearch, landscape-msg]37 - [rsyslog-elasticsearch, landscape-msg]
31 - [rsyslog-elasticsearch, landscape-postgresql]38 - [rsyslog-elasticsearch, landscape-postgresql]
32 - [rsyslog-elasticsearch, mongodb]39 - [rsyslog-elasticsearch, mongodb]
33 - [rsyslog-elasticsearch, mysql]40 - [rsyslog-elasticsearch, mysql]
34 - [rsyslog-elasticsearch, ncc-memcached]41 - [rsyslog-elasticsearch, ncc-memcached]
35 - [rsyslog-elasticsearch, neutron-api]42 - [rsyslog-elasticsearch, neutron-api]
36 - [rsyslog-elasticsearch, neutron-gateway]43 - [rsyslog-elasticsearch, neutron-gateway]
37 - [rsyslog-elasticsearch, nova-cloud-controller]44 - [rsyslog-elasticsearch, nova-cloud-controller]
38 - [rsyslog-elasticsearch, openstack-dashboard]45 - [rsyslog-elasticsearch, openstack-dashboard]
39 - [rsyslog-elasticsearch, rabbitmq-server]46 - [rsyslog-elasticsearch, rabbitmq-server]
40 - [rsyslog-elasticsearch, swift-proxy]47 - [rsyslog-elasticsearch, swift-proxy]
41 - [rsyslog-elasticsearch, ubuntu-nagios]48 - [rsyslog-elasticsearch, ubuntu-nagios]
42 - [rsyslog-elasticsearch, infra]49 - [rsyslog-elasticsearch, infra]
43 - [rsyslog-elasticsearch, os-hosts]50 - [rsyslog-elasticsearch, os-hosts]
51
52# reporting: create a KVM with maas' tag=reporting as reporting/0
53bootstack-reporting-stage0:
54 inherits: [bootstack-stage2-complete]
55 services:
56 reporting:
57 charm: ubuntu
58 constraints: tags=reporting
59
60# reporting: smoosh prometheus + grafana + alertmanager into reporting/0
61bootstack-reporting:
62 inherits: [bootstack-reporting-stage0]
63 override:
64 nagios_context: *NAGIOS_CONTEXT
65 nagios_servicegroups: *REGION
66 services:
67 prometheus:
68 #charm: cs:~prometheus-charmers/prometheus
69 charm: prometheus
70 num_units: 1
71 to: *REPORTING_SVC_TO
72 options:
73 ## XXX(jjo): depends on customer setup (maas-proxy) ->
74 snap_proxy: http://10.76.12.1:8000/
75 ## XXX(jjo): need to charm openstack-exporter, for now point to the manually deployed install:
76 ## https://github.com/CanonicalLtd/prometheus-openstack-exporter
77 static-targets: 'localhost:9183'
78 grafana:
79 #charm: cs:~prometheus-charmers/grafana
80 charm: grafana
81 num_units: 1
82 to: *REPORTING_SVC_TO
83 options:
84 ## XXX: default deb archive at packagecloud.io redirects to:
85 ## packagecloud-repositories.s3.dualstack.us-west-1.amazonaws.com
86 install_file: https://grafanarel.s3.amazonaws.com/builds/grafana-data_4.1.1-1484211277_amd64.deb
87# ops-agents.yaml would need to set ->
88# datasources: 'prometheus,BootStack Prometheus,proxy,http://172.12.x.x:9090,,'
89 ## XXX: must go to secrets.yaml
90 admin_password: admin
91 prometheus-alertmanager:
92 #charm: cs:~prometheus-charmers/trusty/prometheus-alertmanager
93 charm: prometheus-alertmanager
94 to: *REPORTING_SVC_TO
95 relations:
96 - ["grafana:grafana-source", "prometheus:grafana-source"]
97 - ["prometheus:alertmanager-service", "prometheus-alertmanager:alertmanager-service"]
98
99# reporting: deploy telegraf subordinate into every metal or containerized node,
100# XXX: below stanza will need to be autogenerated (ala landscape-client) against:
101# - metals (= os-hosts)
102# - all LXC'd services
103
104bootstack-reporting-agents:
105 inherits: [bootstack-reporting]
106 services:
107 telegraf:
108 #charm: cs:telegraf
109 charm: telegraf
110 options:
111# prometheus_output_port: "9103"
112# extra_plugins: |
113# [[inputs.bcache]]
114# [[inputs.conntrack]]
115# [[inputs.sysstat]]
116# sadc_path = "/usr/lib/sysstat/sadc"
117# activities = ["DISK"]
118
119 relations:
120 - [ telegraf, os-hosts ]
121 - [ "prometheus:target", "telegraf:prometheus-client"]
122
123# vim: et si sw=4 ts=4

Subscribers

People subscribed via source and target branches

to all changes: