diff --git a/devstack.yml b/devstack.yml index 4606002..bbcbe14 100644 --- a/devstack.yml +++ b/devstack.yml @@ -26,6 +26,10 @@ - python-novaclient - name: Add mini-mon to hosts file lineinfile: dest=/etc/hosts regexp="^{{ mini_mon }}" line="{{ mini_mon }} mini-mon" state=present + - name: Setup Monasca group + group: name={{monasca_group}} system=yes + - name: Add ansible user to Monasca group + user: name={{ansible_ssh_user}} groups={{monasca_group}} append=yes tasks: - name: Setup the monasca cli credentials in the default environment copy: src=env.sh dest=/etc/profile.d/monasca_cli.sh owner=root group=root mode=0644 @@ -36,3 +40,9 @@ - {role: monasca-keystone, tags: [devstack, keystone]} - {role: monasca-devstack, tags: [devstack]} - {role: monasca-agent, tags: [agent]} + - {role: monasca-log-agent, + log_files: + [{ tags: '["syslog"]', + type: '"system"', + path: '"/var/log/messages"' }], + tags: [log_agent, agent]} diff --git a/group_vars/all b/group_vars/all index 1456856..d3e4389 100644 --- a/group_vars/all +++ b/group_vars/all @@ -2,9 +2,13 @@ devstack: 192.168.10.5 mini_mon: 192.168.10.4 +monasca_group: monasca + keystone_url: "http://{{devstack}}:35357/v3" monasca_api_host: "{{mini_mon}}" monasca_api_url: http://{{ monasca_api_host }}:8070/v2.0 +monasca_log_api_host: "{{mini_mon}}" +monasca_log_api_url: http://{{ monasca_log_api_host }}:5607 monasca_agent_check_frequency: 15 monasca_virtualenv_dir: /opt/monasca @@ -12,3 +16,8 @@ keystone_admin_token: ADMIN monasca_agent_user: monasca-agent monasca_agent_password: password monasca_agent_project: mini-mon +monasca_log_agent_user: "{{monasca_agent_user}}" +monasca_log_agent_password: "{{monasca_agent_password}}" +monasca_log_agent_project: "{{monasca_agent_project}}" + +download_tmp_dir: /opt/monasca_download_dir diff --git a/logs.yml b/logs.yml new file mode 100644 index 0000000..1bf296b --- /dev/null +++ b/logs.yml @@ -0,0 +1,17 @@ +--- + +- name: Monasca Logging Install + hosts: mini-mon + sudo: yes + roles: + - {role: monasca-log-schema, tags: [elkstack]} + - {role: monasca-log-api, + tags: [api, log_api]} + - {role: monasca-elkstack, + tags: [elkstack]} + - {role: monasca-log-agent, + log_files: + [{ tags: '["monasca_java"]', + type: '"monasca-api"', + path: '"/var/log/monasca/api/*.log"' }], + tags: [log_agent, agent]} diff --git a/mini-mon.yml b/mini-mon.yml index a7dd013..82ededc 100644 --- a/mini-mon.yml +++ b/mini-mon.yml @@ -47,6 +47,10 @@ pre_tasks: - name: Add devstack to hosts file lineinfile: dest=/etc/hosts regexp="^{{ devstack }}" line="{{ devstack }} devstack" state=present + - name: Setup Monasca group + group: name={{monasca_group}} system=yes + - name: Add ansible user to Monasca group + user: name={{ansible_ssh_user}} groups={{monasca_group}} append=yes tasks: - name: Setup the monasca cli credentials in the default environment copy: src=env.sh dest=/etc/profile.d/monasca_cli.sh owner=root group=root mode=0644 @@ -81,4 +85,5 @@ roles: - {role: monasca-default-alarms, tags: [alarms]} +- include: logs.yml - include: smoke.yml diff --git a/monasca-ansible-repos.sh b/monasca-ansible-repos.sh index 22ed575..1e60109 100755 --- a/monasca-ansible-repos.sh +++ b/monasca-ansible-repos.sh @@ -15,9 +15,14 @@ https://github.com/hpcloud-mon/ansible-influxdb.git https://github.com/hpcloud-mon/ansible-kafka.git https://github.com/hpcloud-mon/ansible-percona.git https://github.com/hpcloud-mon/ansible-storm.git -https://github.com/hpcloud-mon/ansible-zookeeper.git' +https://github.com/hpcloud-mon/ansible-zookeeper.git +https://github.com/FujitsuEnablingSoftwareTechnologyGmbH/ansible-monasca-log-schema.git +https://github.com/FujitsuEnablingSoftwareTechnologyGmbH/ansible-monasca-log-api.git +https://github.com/FujitsuEnablingSoftwareTechnologyGmbH/ansible-monasca-elkstack.git +https://github.com/FujitsuEnablingSoftwareTechnologyGmbH/ansible-monasca-log-agent.git' -# Other repos not in the standard list are found at https://github.com/hpcloud-mon and https://github.com/openstack?query=monasca +# Other repos not in the standard list are found at +# https://github.com/hpcloud-mon and https://github.com/openstack?query=monasca if [ $# -ne 1 ]; then echo 'Usage: $0 ' diff --git a/monasca-repos.sh b/monasca-repos.sh index a3fa620..bbd4887 100755 --- a/monasca-repos.sh +++ b/monasca-repos.sh @@ -4,6 +4,7 @@ monasca_repos='https://github.com/openstack/monasca-agent.git https://github.com/openstack/monasca-api.git +https://github.com/openstack/monasca-log-api.git https://github.com/openstack/monasca-common.git https://github.com/openstack/monasca-notification.git https://github.com/openstack/monasca-persister.git @@ -11,9 +12,12 @@ https://github.com/openstack/monasca-thresh.git https://github.com/openstack/monasca-ui.git https://github.com/openstack/python-monascaclient.git https://github.com/hpcloud-mon/grafana -https://github.com/hpcloud-mon/monasca-tempest.git' +https://github.com/hpcloud-mon/monasca-tempest.git +https://github.com/FujitsuEnablingSoftwareTechnologyGmbH/logstash-output-monasca_api.git +https://github.com/FujitsuEnablingSoftwareTechnologyGmbH/kibana.git' -# Other repos not in the standard list are found at https://github.com/hpcloud-mon and https://github.com/openstack?query=monasca +# Other repos not in the standard list are found at +# https://github.com/hpcloud-mon and https://github.com/openstack?query=monasca if [ $# -ne 1 ]; then echo 'Usage: $0 ' diff --git a/requirements.yml b/requirements.yml index bac9a51..ebe9952 100644 --- a/requirements.yml +++ b/requirements.yml @@ -36,3 +36,11 @@ name: zookeeper - src: mhoppal.vertica name: vertica +- src: https://github.com/FujitsuEnablingSoftwareTechnologyGmbH/ansible-monasca-log-schema + name: monasca-log-schema +- src: https://github.com/FujitsuEnablingSoftwareTechnologyGmbH/ansible-monasca-log-api + name: monasca-log-api +- src: https://github.com/FujitsuEnablingSoftwareTechnologyGmbH/ansible-monasca-elkstack + name: monasca-elkstack +- src: https://github.com/FujitsuEnablingSoftwareTechnologyGmbH/ansible-monasca-log-agent + name: monasca-log-agent