Merge "Added ceph plugin and other fixes"

defaults/main.yml

@@ -47,6 +47,7 @@ monasca_agent_system_user_home: "/var/lib/{{ monasca_agent_system_user_name }}"
 # Monasca-agent configuration
 monasca_agent_user_name: monasca-agent
 monasca_agent_project_name: admin
+monasca_service_region: RegionOne
 
 monasca_agent_check_frequency: 15
 monasca_agent_log_level: WARN
@@ -221,6 +222,7 @@ monasca_agent_os_processes_to_monitor:
     - name: cinder-scheduler
     - name: cinder-volume
     - name: cinder-backup
+      enabled: "{{ cinder_service_backup_program_enabled | default(False) }}"
 
 haproxy_ssl: True
 galera_monitoring_user: "monitoring"
@@ -230,6 +232,8 @@ monasca_agent_plugins_http_check_disabled:
   - nova_console
 
 monasca_agent_plugins:
+  - name: "ceph"
+    where: "ceph-mon"
   - name: "cpu"
     where: "all"
   - name: "disk"

doc/source/configure-monasca-agent.rst

@@ -34,6 +34,7 @@ Plugins
 By default the monasca-agent role configures the following plugins:
 
    - apache
+   - ceph
    - cpu
    - crash
    - disk
@@ -58,12 +59,3 @@ More information about the available plugins, its configuration
 and metric details is available at the `monasca-agent repository`_.
 
 .. _monasca-agent repository: https://github.com/openstack/monasca-agent/blob/master/docs/Plugins.md
-
-Dashboards
-~~~~~~~~~~
-
-Sample grafana dashboards for visualization of some metrics collected
-by the configured plugins are also available at the
-`monasca-agent role repository`_.
-
-.. _monasca-agent role repository: https://github.com/openstack/openstack-ansible-os_monasca-agent/tree/master/dashboards

extras/group_vars/all/monasca-agent.yml

@@ -12,7 +12,7 @@
 # limitations under the License.
 
 monasca_agent_venv_tag: "{{ venv_tag }}"
-monasca_agent_venv_download_url: "{{ venv_base_download_url }}/monasca_agent-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
+monasca_agent_venv_download_url: "{{ venv_base_download_url }}/monasca-agent-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
 
 monasca_service_port: 8070
 monasca_service_proto: http

extras/os-monasca-agent-install.yml

@@ -40,8 +40,6 @@
         - crontab
   vars:
     is_metal: "{{ properties.is_metal|default(false) }}"
-  vars_files:
-    - vars/configs/haproxy_config.yml
   tags:
     - monasca
 

tasks/monasca_agent_post_install.yml

@@ -57,6 +57,19 @@
   notify:
     - Restart monasca-agent services
 
+- name: Add monasca-agent user to ceph group
+  user:
+    name: "monasca-agent"
+    groups: "ceph"
+    append: yes
+  when: inventory_hostname in groups['ceph-mon'] | default([])
+
+- name: Add read permission on ceph key to group
+  file:
+    path: "/etc/ceph/ceph.client.admin.keyring"
+    mode: 0640
+  when: inventory_hostname in groups['ceph-mon'] | default([])
+
 - name: Allow monasca user to have passwordless find
   lineinfile:
     dest: /etc/sudoers

templates/agent.yaml.j2

@@ -11,14 +11,14 @@ Api:
   max_measurement_buffer_size: -1
   password: {{ monasca_agent_password }}
   project_domain_id: null
-  project_domain_name: null
+  project_domain_name: {{ monasca_service_domain_name | default("Default") }}
   project_id: null
   project_name: {{ monasca_agent_project_name }}
-  region_name: null
-  service_type: null
+  region_name: {{ monasca_service_region }}
+  service_type: monitoring
   url: {{ monasca_service_adminurl }}
   user_domain_id: null
-  user_domain_name: null
+  user_domain_name: {{ monasca_service_domain_name | default("Default") }}
   username: {{ monasca_agent_user_name }}
 Logging:
   collector_log_file: /var/log/monasca/agent/collector.log

templates/conf.d/ceph.yaml.j2

@@ -0,0 +1,11 @@
+# {{ ansible_managed }}
+
+init_config: null
+
+instances:
+  - cluster_name: ceph
+    collect_usage_metrics: True
+    collect_stats_metrics: True
+    collect_mon_metrics: True
+    collect_osd_metrics: True
+    collect_pool_metrics: True

templates/conf.d/host_alive.yaml.j2

@@ -5,8 +5,8 @@ init_config: null
 
 instances:
 {% for host in groups['all'] %}
-  - name: {{ ansible_hostname }}
-    host_name: {{ ansible_hostname }}
+  - name: {{ host }}
+    host_name: {{ host }}
     alive_test: ssh
     dimensions:
 {% if host in groups['all_containers'] %}

templates/conf.d/http_check.yaml.j2

@@ -13,7 +13,7 @@ instances:
 {%     else                                                                                                                                    %}
 {%       set _merge =  monasca_agent_os_processes_to_monitor.update(monasca_agent_infra_processes_to_monitor)                                  %}
 {%       set found = False                                                                                                                     %}
-{%       for service, processes in monasca_agent_os_processes_to_monitor.iteritems() if not found                                              %}
+{%       for service, processes in monasca_agent_os_processes_to_monitor.items() if not found                                                  %}
 {%         for p in processes                                                                                                                  %}
 {%           if service_name.value in p.name                                                                                                   %}
 {%             set found = service_name.update({'value': service})                                                                             %}
@@ -37,6 +37,7 @@ instances:
     collect_response_time: true
     url: {{ proto }}://{% if item.service.haproxy_bind is defined %}{{ item.service.haproxy_bind.0 }}{% else %}{{ external_lb_vip_address }}{% endif %}:{{ item.service.haproxy_port }}{{path | default('') }}
     use_keystone: {% if item.service.haproxy_service_name == 'monasca_api' %}yes{% else %}no{% endif %}
+
     dimensions:
       service: {{ service_name.value }}
       component: {{ item.service.haproxy_service_name | replace('_', '-') }}

templates/conf.d/process.yaml.j2

@@ -11,7 +11,7 @@ instances:
       component: monasca-agent
       service: monitoring
 
-{% for service, processes in monasca_agent_os_processes_to_monitor.iteritems()                                                         %}
+{% for service, processes in monasca_agent_os_processes_to_monitor.items()                                                         %}
 {%   for item in processes                                                                                                             %}
 {%     if item.enabled | default(True) and inventory_hostname in groups[item.group|default(item.name|replace('-', '_'))] | default([]) %}
   - name: {{ item.name }}
@@ -26,7 +26,7 @@ instances:
 {%     endif                                                                                                                           %}
 {%   endfor                                                                                                                            %}
 {% endfor                                                                                                                              %}
-{% for service, processes in monasca_agent_infra_processes_to_monitor.iteritems()                                                      %}
+{% for service, processes in monasca_agent_infra_processes_to_monitor.items()                                                      %}
 {%   for item in processes                                                                                                             %}
 {%     if item.enabled | default(True) and inventory_hostname in groups[item.group|default(item.name|replace('-', '_'))] | default([]) %}
   - name: {{ item.name }}

templates/monasca-reconfigure.j2

@@ -6,7 +6,10 @@
     -s 'monitoring' \
     --keystone_url '{{ keystone_service_adminurl }}' \
     --project_name '{{ monasca_agent_project_name }}' \
-    --monasca_url '{{ monasca_service_adminurl }}' \
+    --project_domain_name '{{ monasca_service_domain_name | default("Default") }}' \
+    --user_domain_name '{{ monasca_service_domain_name | default("Default") }}' \
+    --endpoint_type 'internal' \
+    --region_name '{{ monasca_service_region }}' \
     --check_frequency '{{ monasca_agent_check_frequency }}' \
     --log_level '{{ monasca_agent_log_level }}' \
     --user '{{ monasca_agent_system_user_name }}' \