Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ansible/cluster-infra-configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@
- import_playbook: cluster-admins.yml

# Install monitoring services
- import_playbook: monitoring.yml
- import_playbook: monitoring-agent.yml
- import_playbook: monitoring-rsyslog.yml
- import_playbook: monitoring-dashboard.yml

# Cluster login setup
- import_playbook: slurm.yml
Expand Down
23 changes: 23 additions & 0 deletions ansible/monitoring-agent.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#
# Copyright StackHPC, 2017
#
---
- name: Configure instance monitoring
hosts: cluster
become: yes
roles:
- role: stackhpc.monasca-agent
keystone_url: "http://{{ controller_vip }}:5000/v3"
monasca_user: root
monasca_agent_user: "{{ monasca_agent_p3_username }}"
monasca_agent_password: "{{ monasca_agent_p3_password }}"
monasca_agent_project: "{{ project_name }}"
monasca_agent_branch: stable/pike
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can switch this to stein now

monasca_pip_extra_args: "-c https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike"
monasca_endpoint_type: public
monasca_project_domain_name: Default
monasca_user_domain_name: Default
monasca_region_name: RegionOne
monasca_service_type: monitoring
monasca_agent_custom_plugin_repos:
- "https://github.com/stackhpc/stackhpc-monasca-agent-plugins.git@master"
26 changes: 26 additions & 0 deletions ansible/monitoring-dashboard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#
# Copyright StackHPC, 2017
#
---
- name: Configure dashboards
hosts: cluster_login
run_once: true
roles:
- role: stackhpc.grafana-conf
grafana_conf_organisation: "{{ project_name }}"
grafana_conf_grafana_admin_user: "{{ grafana_admin_username }}"
grafana_conf_grafana_admin_pass: "{{ grafana_admin_password }}"
grafana_conf_grafana_dashboard_repo:
repo: "https://github.com/stackhpc/grafana-reference-dashboards.git"
checkout_path: "{{ ansible_user_dir }}/grafana-dashboards"
version: "master"
relative_path: "/monasca/tenant"
grafana_conf_grafana_url: "http://{{ controller_vip }}:3000"
grafana_conf_grafana_datasources:
# TODO: Change to VIP when these are behind HAProxy
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alaska_monitoring_server can go and we can use controller_vip

monasca_api:
port: 8082
host: "{{ alaska_monitoring_server }}"
monasca_log_api:
port: 5607
host: "{{ alaska_monitoring_server }}"
22 changes: 22 additions & 0 deletions ansible/monitoring-rsyslog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#
# Copyright StackHPC, 2017
#
---
- name: Configure instance monitoring
hosts: cluster
become: yes
roles:
- role: stackhpc.monasca-rsyslog
monasca_rsyslog_api_auth:
auth_url: "http://{{ controller_vip }}:5000/v3"
project: "{{ project_name }}"
username: "{{ monasca_agent_p3_username }}"
password: "{{ monasca_agent_p3_password }}"
service_type: logging
endpoint_type: public
region_name: RegionOne
monasca_rsyslog_api_verbosity: 1
monasca_rsyslog_api_max_batch_size: 100
monasca_rsyslog_api_min_poll_delay: 10
monasca_rsyslog_branch: '0.3.0'
monasca_rsyslog_venv: "/opt/monasca-rsyslog"
57 changes: 0 additions & 57 deletions ansible/monitoring.yml

This file was deleted.

1 change: 1 addition & 0 deletions ansible/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
version: v19.4.1
- src: stackhpc.monasca-agent
- src: stackhpc.monasca-rsyslog
version: 1.1.0
- src: stackhpc.grafana-conf
- src: stackhpc.gluster-cluster
- src: stackhpc.openhpc
Expand Down