diff --git a/ansible/install/check-collectd-config.yml b/ansible/install/check-collectd-config.yml new file mode 100644 index 000000000..086eb8ee0 --- /dev/null +++ b/ansible/install/check-collectd-config.yml @@ -0,0 +1,8 @@ +--- +- hosts: localhost + tasks: + - name: Check if graphite_host is empty in group_vars/all.yml + include_vars: + file: "group_vars/all.yml" + name: group_vars + failed_when: group_vars['graphite_host'] is none diff --git a/ansible/install/start-collectd-baremetal.yml b/ansible/install/start-collectd-baremetal.yml new file mode 100644 index 000000000..f0b673479 --- /dev/null +++ b/ansible/install/start-collectd-baremetal.yml @@ -0,0 +1,80 @@ +--- +# +# Playbook to start collectd on undercloud/overcloud +# +# Start on all undercloud/overcloud machines: +# ansible-playbook -i hosts.yml install/start-collectd-baremetal.yml +# +# Or use tags: +# ansible-playbook -i hosts.yml install/start-collectd-baremetal.yml --tag "undercloud" +# ansible-playbook -i hosts.yml install/start-collectd-baremetal.yml --tag "controller" +# ansible-playbook -i hosts.yml install/start-collectd-baremetal.yml --tag "networker" +# ansible-playbook -i hosts.yml install/start-collectd-baremetal.yml --tag "blockstorage" +# ansible-playbook -i hosts.yml install/start-collectd-baremetal.yml --tag "objectstorage" +# ansible-playbook -i hosts.yml install/start-collectd-baremetal.yml --tag "cephstorage" +# ansible-playbook -i hosts.yml install/start-collectd-baremetal.yml --tag "compute" +# + + +- hosts: Undercloud + remote_user: "{{ local_remote_user }}" + tasks: + - name: Start Collectd on undercloud + service: name=collectd state=started enabled=false + become: true + ignore_errors: true + tags: undercloud + +- hosts: Controller + remote_user: "{{ host_remote_user }}" + tasks: + - name: Start Collectd on controller + service: name=collectd state=started enabled=false + become: true + ignore_errors: true + tags: controller + +- hosts: Networker + remote_user: "{{ host_remote_user }}" + tasks: + - name: Start Collectd on networker + service: name=collectd state=started enabled=false + become: true + ignore_errors: true + tags: networker + +- hosts: BlockStorage + remote_user: "{{ host_remote_user }}" + tasks: + - name: Start Collectd on blockstorage + service: name=collectd state=started enabled=false + become: true + ignore_errors: true + tags: blockstorage + +- hosts: ObjectStorage + remote_user: "{{ host_remote_user }}" + tasks: + - name: Start Collectd on objectstorage + service: name=collectd state=started enabled=false + become: true + ignore_errors: true + tags: objectstorage + +- hosts: CephStorage + remote_user: "{{ host_remote_user }}" + tasks: + - name: Start Collectd on cephstorage + service: name=collectd state=started enabled=false + become: true + ignore_errors: true + tags: cephstorage + +- hosts: Compute + remote_user: "{{ host_remote_user }}" + tasks: + - name: Start Collectd on compute + service: name=collectd state=started enabled=false + become: true + ignore_errors: true + tags: compute diff --git a/ansible/install/start-collectd-container.yml b/ansible/install/start-collectd-container.yml new file mode 100644 index 000000000..36bbd2246 --- /dev/null +++ b/ansible/install/start-collectd-container.yml @@ -0,0 +1,122 @@ + +# +# Playbook to start collectd on undercloud/overcloud +# +# Start collectd on all undercloud/overcloud machines: +# ansible-playbook -i hosts.yaml install/start-collectd-container.yml +# +# Or use tags: +# ansible-playbook -i hosts.yml install/start-collectd-container.yml --tag "undercloud" +# ansible-playbook -i hosts.yml install/start-collectd-container.yml --tag "controller" +# ansible-playbook -i hosts.yml install/start-collectd-container.yml --tag "networker" +# ansible-playbook -i hosts.yml install/start-collectd-container.yml --tag "blockstorage" +# ansible-playbook -i hosts.yml install/start-collectd-container.yml --tag "objectstorage" +# ansible-playbook -i hosts.yml install/start-collectd-container.yml --tag "cephstorage" +# ansible-playbook -i hosts.yml install/start-collectd-container.yml --tag "compute" +# + + +- hosts: Undercloud + remote_user: "{{ local_remote_user }}" + vars: + config_type: undercloud + roles: + - { role: osp_version } + - { role: containers } + tasks: + - name: Start Collectd on {{ config_type }} + shell: | + {{ container_cli }} start collectd-{{ config_type }} + become: yes + ignore_errors: true + tags: undercloud + +- hosts: Controller + remote_user: "{{ host_remote_user }}" + vars: + config_type: controller + roles: + - { role: osp_version } + - { role: containers } + tasks: + - name: Start Collectd on {{ config_type }} + shell: | + {{ container_cli }} start collectd-{{ config_type }} + become: yes + ignore_errors: true + tags: controller + +- hosts: Networker + remote_user: "{{ host_remote_user }}" + vars: + config_type: networker + roles: + - { role: osp_version } + - { role: containers } + tasks: + - name: Start Collectd on {{ config_type }} + shell: | + {{ container_cli }} start collectd-{{ config_type }} + become: yes + ignore_errors: true + tags: networker + +- hosts: BlockStorage + remote_user: "{{ host_remote_user }}" + vars: + config_type: blockstorage + roles: + - { role: osp_version } + - { role: containers } + tasks: + - name: Start Collectd on {{ config_type }} + shell: | + {{ container_cli }} start collectd-{{ config_type }} + become: yes + ignore_errors: true + tags: blockstorage + +- hosts: ObjectStorage + remote_user: "{{ host_remote_user }}" + vars: + config_type: objectstorage + roles: + - { role: osp_version } + - { role: containers } + tasks: + - name: Start Collectd on {{ config_type }} + shell: | + {{ container_cli }} start collectd-{{ config_type }} + become: yes + ignore_errors: true + tags: objectstorage + +- hosts: CephStorage + remote_user: "{{ host_remote_user }}" + vars: + config_type: cephstorage + roles: + - { role: osp_version } + - { role: containers } + tasks: + - name: Start Collectd on {{ config_type }} + shell: | + {{ container_cli }} start collectd-{{ config_type }} + become: yes + ignore_errors: true + tags: cephstorage + +- hosts: Compute + remote_user: "{{ host_remote_user }}" + vars: + config_type: compute + roles: + - { role: osp_version } + - { role: containers } + tasks: + - name: Start Collectd on {{ config_type }} + shell: | + {{ container_cli }} start collectd-{{ config_type }} + become: yes + ignore_errors: true + tags: compute diff --git a/ansible/install/start-collectd.yml b/ansible/install/start-collectd.yml new file mode 100644 index 000000000..bd9f697ac --- /dev/null +++ b/ansible/install/start-collectd.yml @@ -0,0 +1,11 @@ +--- +- name: set fact collectd_container + import_playbook: pre-collectd.yml + +- name: Start containerized collectd (Stein and greater recommended) + import_playbook: start-collectd-container.yml + when: hostvars['undercloud']['collectd_container'] + +- name: Start collectd installed through RPMs + import_playbook: start-collectd-baremetal.yml + when: not hostvars['undercloud']['collectd_container'] diff --git a/browbeat-complete.yaml b/browbeat-complete.yaml index 2c9dac4d9..63967a7dd 100644 --- a/browbeat-complete.yaml +++ b/browbeat-complete.yaml @@ -3,10 +3,20 @@ browbeat: cloud_name: openstack rerun: 3 rerun_type: iteration + # This option enables starting collectd before running workloads, + # and stopping collectd after running workloads. It should be enabled + # when it is required to store collectd data only when workloads + # are running. Please install collectd by running the command + # "cd ansible;ansible-playbook -i hosts.yml -vvv install/collectd.yml" before + # setting this option to true. + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: true diff --git a/browbeat-config.yaml b/browbeat-config.yaml index 5f338e3d8..a387eb5c6 100644 --- a/browbeat-config.yaml +++ b/browbeat-config.yaml @@ -7,10 +7,20 @@ browbeat: # complete reruns after all workloads complete # rerun_type: complete rerun_type: iteration + # This option enables starting collectd before running workloads, + # and stopping collectd after running workloads. It should be enabled + # when it is required to store collectd data only when workloads + # are running. Please install collectd by running the command + # "cd ansible;ansible-playbook -i hosts.yml -vvv install/collectd.yml" before + # setting this option to true. + start_stop_collectd: false ansible: hosts: ansible/hosts.yml metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/browbeat.py b/browbeat.py index 9e8a73b80..8ba3cbccc 100755 --- a/browbeat.py +++ b/browbeat.py @@ -182,6 +182,10 @@ def main(): " with browbeat_uuid {}".format(browbeat_uuid)) tools.common_logging(browbeat_uuid, logging_status=True) + if _config['browbeat']['start_stop_collectd'] and tools.check_collectd_config(): + _logger.info("Starting collectd") + tools.start_collectd() + _logger.info("Running workload(s): {}".format(','.join(_cli_args.workloads))) # Iteration rerun_type pushes rerun logic down to the workload itself. This allows the workload @@ -191,6 +195,9 @@ def main(): elif _config["browbeat"]["rerun_type"] == "complete": # Complete rerun_type, reruns after all workloads have been run. run_complete(_config, _cli_args, result_dir_ts, _logger, tools) + if _config["browbeat"]["start_stop_collectd"] and tools.check_collectd_config(): + _logger.info("Stopping collectd") + tools.stop_collectd() if terminate: _logger.info("Browbeat execution halting due to user intervention") sys.exit(1) diff --git a/browbeat/schema/browbeat.yml b/browbeat/schema/browbeat.yml index e05bae4e2..95a7b3303 100644 --- a/browbeat/schema/browbeat.yml +++ b/browbeat/schema/browbeat.yml @@ -19,6 +19,9 @@ mapping: type: str enum: ['iteration', 'complete'] required: True + start_stop_collectd: + type: bool + required: True ansible: required: True type: map @@ -32,6 +35,15 @@ mapping: logging_playbook: type: str required: True + start_collectd_playbook: + type: str + required: True + stop_collectd_playbook: + type: str + required: True + check_collectd_config_playbook: + type: str + required: True ssh_config: type: str required: True diff --git a/browbeat/tools.py b/browbeat/tools.py index 57fabe01b..8e7de972f 100644 --- a/browbeat/tools.py +++ b/browbeat/tools.py @@ -92,6 +92,46 @@ class Tools(object): self.logger.info("Metadata about cloud has been gathered") return True + def check_collectd_config(self): + ansible_cmd = \ + 'ansible-playbook {}' \ + .format(self.config['ansible']['check_collectd_config_playbook']) + returncode = self.run_cmd(ansible_cmd)['rc'] + if returncode > 0: + self.logger.warning("""graphite_host is empty in all.yml. Please fill it and run the command + (cd ansible;ansible-playbook -i hosts.yml -vvv install/collectd.yml) + in order to install collectd.""") + return False + else: + self.logger.info("Collectd config in all.yml validated") + return True + + def start_collectd(self): + ansible_cmd = \ + 'ansible-playbook -i {} {}' \ + .format(self.config['ansible']['hosts'], + self.config['ansible']['start_collectd_playbook']) + returncode = self.run_cmd(ansible_cmd)['rc'] + if returncode > 0: + self.logger.warning("Collectd could not be started") + return False + else: + self.logger.info("Collectd started successfully") + return True + + def stop_collectd(self): + ansible_cmd = \ + 'ansible-playbook -i {} {}' \ + .format(self.config['ansible']['hosts'], + self.config['ansible']['stop_collectd_playbook']) + returncode = self.run_cmd(ansible_cmd)['rc'] + if returncode > 0: + self.logger.warning("Collectd could not be stopped") + return False + else: + self.logger.info("Collectd stopped successfully") + return True + def common_logging(self, browbeat_uuid, logging_status): os.putenv("ANSIBLE_SSH_ARGS", " -F {}".format(self.config['ansible']['ssh_config'])) ansible_cmd = \ diff --git a/conf/browbeat-glance-complete.yaml b/conf/browbeat-glance-complete.yaml index 8f4ea5c12..ae926aefc 100644 --- a/conf/browbeat-glance-complete.yaml +++ b/conf/browbeat-glance-complete.yaml @@ -3,10 +3,14 @@ browbeat: cloud_name: openstack rerun: 1 rerun_type: iteration + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/conf/browbeat-keystone-complete.yaml b/conf/browbeat-keystone-complete.yaml index 39fe57ba1..7c5d4b9da 100644 --- a/conf/browbeat-keystone-complete.yaml +++ b/conf/browbeat-keystone-complete.yaml @@ -4,10 +4,14 @@ browbeat: cloud_name: openstack rerun: 3 rerun_type: iteration + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/conf/browbeat-keystone-minimal.yaml b/conf/browbeat-keystone-minimal.yaml index 50e98c86d..d1cd4c42d 100644 --- a/conf/browbeat-keystone-minimal.yaml +++ b/conf/browbeat-keystone-minimal.yaml @@ -4,10 +4,14 @@ browbeat: cloud_name: openstack rerun: 1 rerun_type: iteration + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/conf/browbeat-workloads.yml b/conf/browbeat-workloads.yml index f7235a91b..95dbfd66e 100644 --- a/conf/browbeat-workloads.yml +++ b/conf/browbeat-workloads.yml @@ -3,10 +3,14 @@ browbeat: cloud_name: openstack rerun: 1 rerun_type: iteration + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/conf/ceilometer-minimal.yaml b/conf/ceilometer-minimal.yaml index 9179e385f..dabf35eee 100644 --- a/conf/ceilometer-minimal.yaml +++ b/conf/ceilometer-minimal.yaml @@ -3,10 +3,14 @@ browbeat: cloud_name: openstack rerun: 1 rerun_type: iteration + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/conf/ceilometer-persist-response-timing.yaml b/conf/ceilometer-persist-response-timing.yaml index 04a0a426c..61c0467d6 100644 --- a/conf/ceilometer-persist-response-timing.yaml +++ b/conf/ceilometer-persist-response-timing.yaml @@ -6,10 +6,14 @@ browbeat: cloud_name: openstack rerun: 10 rerun_type: complete + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/conf/gnocchi-minimal.yaml b/conf/gnocchi-minimal.yaml index 16269ba8d..939569345 100644 --- a/conf/gnocchi-minimal.yaml +++ b/conf/gnocchi-minimal.yaml @@ -4,10 +4,14 @@ browbeat: cloud_name: openstack rerun: 1 rerun_type: iteration + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/conf/quickstart.yml b/conf/quickstart.yml index c7bf2ba3f..8c25879d2 100644 --- a/conf/quickstart.yml +++ b/conf/quickstart.yml @@ -3,10 +3,14 @@ browbeat: cloud_name: quickstart rerun: 1 rerun_type: iteration + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml b/conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml index d66ef7f53..218380936 100644 --- a/conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml +++ b/conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml @@ -10,10 +10,14 @@ browbeat: cloud_name: openstack rerun: 10 rerun_type: complete + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml b/conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml index 1ea12c935..0df49a1b4 100644 --- a/conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml +++ b/conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml @@ -10,10 +10,14 @@ browbeat: cloud_name: openstack rerun: 10 rerun_type: complete + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml b/conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml index 334f9e338..83f11cd8b 100644 --- a/conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml +++ b/conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml @@ -10,10 +10,14 @@ browbeat: cloud_name: openstack rerun: 2 rerun_type: complete + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml b/conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml index 242675f81..e06247e37 100644 --- a/conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml +++ b/conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml @@ -10,10 +10,14 @@ browbeat: cloud_name: openstack rerun: 10 rerun_type: complete + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/conf/telemetry-nova-persist-instances-with-network-fip.yaml b/conf/telemetry-nova-persist-instances-with-network-fip.yaml index aae5deb26..4b62099f1 100644 --- a/conf/telemetry-nova-persist-instances-with-network-fip.yaml +++ b/conf/telemetry-nova-persist-instances-with-network-fip.yaml @@ -7,10 +7,14 @@ browbeat: cloud_name: openstack rerun: 1 rerun_type: iteration + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/conf/telemetry-nova-persist-instances-with-network-volume-fip.yaml b/conf/telemetry-nova-persist-instances-with-network-volume-fip.yaml index 7e0132e34..baecd2534 100644 --- a/conf/telemetry-nova-persist-instances-with-network-volume-fip.yaml +++ b/conf/telemetry-nova-persist-instances-with-network-volume-fip.yaml @@ -7,10 +7,14 @@ browbeat: cloud_name: openstack rerun: 1 rerun_type: iteration + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/conf/telemetry-nova-persist-instances-with-network-volume.yaml b/conf/telemetry-nova-persist-instances-with-network-volume.yaml index ee1604038..bd002042a 100644 --- a/conf/telemetry-nova-persist-instances-with-network-volume.yaml +++ b/conf/telemetry-nova-persist-instances-with-network-volume.yaml @@ -6,10 +6,14 @@ browbeat: cloud_name: openstack rerun: 1 rerun_type: iteration + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/conf/telemetry-nova-persist-instances-with-network.yaml b/conf/telemetry-nova-persist-instances-with-network.yaml index 9a0260601..0a1d70c68 100644 --- a/conf/telemetry-nova-persist-instances-with-network.yaml +++ b/conf/telemetry-nova-persist-instances-with-network.yaml @@ -8,10 +8,14 @@ browbeat: cloud_name: openstack rerun: 1 rerun_type: iteration + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/conf/telemetry-nova-persist-instances-with-volume.yaml b/conf/telemetry-nova-persist-instances-with-volume.yaml index 9b101433c..59f6e736b 100644 --- a/conf/telemetry-nova-persist-instances-with-volume.yaml +++ b/conf/telemetry-nova-persist-instances-with-volume.yaml @@ -6,10 +6,14 @@ browbeat: cloud_name: openstack rerun: 1 rerun_type: iteration + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/conf/telemetry-nova-persist-instances.yaml b/conf/telemetry-nova-persist-instances.yaml index 8d7c399e9..fa7de723f 100644 --- a/conf/telemetry-nova-persist-instances.yaml +++ b/conf/telemetry-nova-persist-instances.yaml @@ -7,10 +7,14 @@ browbeat: cloud_name: openstack rerun: 1 rerun_type: iteration + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/stockpile.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/tests/data/invalid_browbeat.yml b/tests/data/invalid_browbeat.yml index b2678b0b3..89d2656ea 100644 --- a/tests/data/invalid_browbeat.yml +++ b/tests/data/invalid_browbeat.yml @@ -4,10 +4,14 @@ browbeat: rerun: 1 rerun_type: complete invalid_flag: invalid + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/site.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/tests/data/invalid_browbeat_workload.yml b/tests/data/invalid_browbeat_workload.yml index 784dd9abc..7ed0d3bd6 100644 --- a/tests/data/invalid_browbeat_workload.yml +++ b/tests/data/invalid_browbeat_workload.yml @@ -3,10 +3,14 @@ browbeat: cloud_name: browbeat-test rerun: 1 rerun_type: complete + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/site.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false diff --git a/tests/data/valid_browbeat.yml b/tests/data/valid_browbeat.yml index 8c4990cd7..8ff665dfd 100644 --- a/tests/data/valid_browbeat.yml +++ b/tests/data/valid_browbeat.yml @@ -3,10 +3,14 @@ browbeat: cloud_name: browbeat-test rerun: 1 rerun_type: complete + start_stop_collectd: false ansible: hosts: ansible/hosts metadata_playbook: ansible/gather/site.yml logging_playbook: ansible/common_logging/browbeat_logging.yml + start_collectd_playbook: ansible/install/start-collectd.yml + stop_collectd_playbook: ansible/install/stop-collectd.yml + check_collectd_config_playbook: ansible/install/check-collectd-config.yml ssh_config: ansible/ssh-config elasticsearch: enabled: false