Skip to content

Commit 2c27bd7

Browse files
authored
Merge pull request #2 from stackhpc/feature/configure_monitoring
Support configuring monitoring and logging
2 parents bf188e5 + 40cb8f7 commit 2c27bd7

File tree

4 files changed

+86
-0
lines changed

4 files changed

+86
-0
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,23 @@ alaska_cloud: alaska
1515
alaska_homedir: /alaska
1616
alaska_softiron: 10.4.99.101
1717

18+
# OpenStack fully qualified project name
19+
project_name: p3@default
20+
21+
# Virtual IP address of the controller node
22+
controller_vip: 10.60.253.1
23+
24+
# IP address from which the logging and monitoring server can be accessed
25+
alaska_monitoring_server: 10.60.253.3
26+
27+
# OpenStack credentials for posting logs and metrics for the P3 project
28+
monasca_agent_p3_username: p3-monasca-agent
29+
monasca_agent_p3_password: "{{ vault_monasca_agent_password }}"
30+
31+
# Local Grafana admin account for configuring Grafana
32+
grafana_admin_username: grafana-admin
33+
grafana_admin_password: "{{ vault_grafana_admin_password }}"
34+
1835
# List of cluster users, already defined in OpenStack
1936
alaska_users:
2037
- name: "Chris Broekema"

ansible/group_vars/all/secrets

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
$ANSIBLE_VAULT;1.1;AES256
2+
39363263323231633231396432363163383464643230616461333630366234663232343835643933
3+
3236373831636265376132626337316337653537643332310a653065313938336539333832323332
4+
38303135373332393463626566303834323237326138643430346266633866623836316563346638
5+
6535343533376464360a343961376637386633303062363731323134613432626462383466316234
6+
66323062323939313166636433363562336561316637373633393137326163336438393236336361
7+
37323762643034653563616132333462636164313661356135353333313039313838303933356461
8+
33323136646630363566623164366137653062643831323563333033346363386564373038393562
9+
35303661306635343130343266363763336261396366393163616534626131663237303136333266
10+
30393136373864613464653366303264623937656336626132623463306261393838386462363661
11+
6363356263383137663433306436336438646432623863656637

ansible/monitoring.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
#
2+
# Copyright StackHPC, 2017
3+
#
4+
---
5+
- name: Configure instance monitoring
6+
hosts: cluster
7+
become: yes
8+
9+
roles:
10+
- role: stackhpc.monasca-agent
11+
keystone_url: "http://{{ controller_vip }}:5000/v3"
12+
monasca_user: root
13+
monasca_agent_user: "{{ monasca_agent_p3_username }}"
14+
monasca_agent_password: "{{ monasca_agent_p3_password }}"
15+
monasca_agent_project: "{{ project_name }}"
16+
monasca_agent_version: 2.2.0
17+
monasca_endpoint_type: public
18+
monasca_project_domain_name: Default
19+
monasca_user_domain_name: Default
20+
monasca_region_name: RegionOne
21+
monasca_service_type: monitoring
22+
monasca_agent_custom_plugin_repos:
23+
- "https://github.com/stackhpc/stackhpc-monasca-agent-plugins.git@master"
24+
25+
- role: stackhpc.monasca-rsyslog
26+
monasca_rsyslog_api_auth:
27+
auth_url: "http://{{ controller_vip }}:5000/v3"
28+
project: "{{ project_name }}"
29+
username: "{{ monasca_agent_p3_username }}"
30+
password: "{{ monasca_agent_p3_password }}"
31+
monasca_rsyslog_venv: "/opt/monasca-rsyslog"
32+
monasca_rsyslog_api_endpoint: "http://{{ alaska_monitoring_server }}:5607/v3.0"
33+
34+
- name: Configure dashboards
35+
hosts: cluster_login
36+
run_once: true
37+
roles:
38+
- role: stackhpc.grafana-conf
39+
grafana_conf_organisation: "{{ project_name }}"
40+
grafana_conf_grafana_admin_user: "{{ grafana_admin_username }}"
41+
grafana_conf_grafana_admin_pass: "{{ grafana_admin_password }}"
42+
grafana_conf_grafana_dashboard_repo:
43+
repo: "https://github.com/stackhpc/grafana-reference-dashboards.git"
44+
checkout_path: "{{ ansible_user_dir }}/grafana-dashboards"
45+
version: "master"
46+
relative_path: "/monasca/tenant"
47+
grafana_conf_grafana_url: "http://{{ controller_vip }}:3000"
48+
grafana_conf_grafana_datasources:
49+
# TODO: Change to VIP when these are behind HAProxy
50+
monasca_api:
51+
port: 8082
52+
host: "{{ alaska_monitoring_server }}"
53+
monasca_log_api:
54+
port: 5607
55+
host: "{{ alaska_monitoring_server }}"

ansible/requirements.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
---
22
- src: stackhpc.cluster-infra
3+
- src: stackhpc.monasca-agent
4+
- src: stackhpc.monasca-rsyslog
5+
- src: stackhpc.grafana-conf

0 commit comments

Comments
 (0)