Remove support for Monasca and its dependencies

This follows removal of support from Kolla Ansible. This also removes
support for configuring Grafana with overcloud post configure.

Change-Id: I8102fafb00db178f1ae6801d37c43a39033cbfe6

README.rst

@@ -48,8 +48,11 @@ Features
   <https://docs.openstack.org/magnum/latest/>`_
 * Big data on bare metal using `OpenStack sahara
   <https://docs.openstack.org/sahara/latest/>`_
-* Control plane and workload monitoring and log aggregation using `OpenStack
+* Control plane monitoring using `Prometheus <https://prometheus.io/>`__ and
-  monasca <https://wiki.openstack.org/wiki/Monasca>`_
+  `Grafana <https://grafana.com/>`__.
+* Log aggregation using `OpenSearch <https://opensearch.org/docs/latest/>`__
+  and `OpenSearch Dashboards
+  <https://opensearch.org/docs/latest/dashboards/index/>`__.
 
 Documentation
 -------------

ansible/inventory/group_vars/all/grafana

@@ -6,40 +6,4 @@
 # should not conflict with an OpenStack user name.
 grafana_local_admin_user_name: "grafana_local_admin"
 
-# Path to git repo containing Grafana dashboards. Eg.
-# https://github.com/stackhpc/grafana-reference-dashboards.git
-grafana_monitoring_node_dashboard_repo:
-
-# Dashboard repo version. Optional, defaults to 'HEAD'.
-grafana_monitoring_node_dashboard_repo_version:
-
-# Path to which Grafana dashboards will be cloned to a monitoring node
-grafana_monitoring_node_dashboard_repo_checkout_path: "{{ source_checkout_path ~ '/grafana-dashboards' }}"
-
-# The path, relative to the grafana_monitoring_node_dashboard_repo_checkout_path
-# containing the dashboards. Eg. /prometheus/control_plane
-grafana_monitoring_node_dashboard_repo_path:
-
-# The Grafana organisation for the control plane. Note that for Monasca
-# Grafana with domain support the format is:
-# organisation_name@openstack_domain
-grafana_control_plane_organisation: "{{ monasca_control_plane_project }}@{{ monasca_control_plane_domain }}"
-
-# A dict of datasources to configure. See the stackhpc.grafana-conf role
-# for all supported datasources. Example:
-#
-# grafana_datasources:
-#   monasca_api:
-#     port: 8082
-#     host: monasca-api
-#   monasca_log_api:
-#     port: 5607
-#     host: monasca-log-api
-#   elasticsearch:
-#     port: 9200
-#     host: monasca-elasticsearch
-#     project_id: "some_id"
-#
-grafana_datasources: {}
-
 ###############################################################################

ansible/inventory/group_vars/all/kolla

@@ -179,16 +179,12 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_ironic_neutron_agent | bool }}"
   - regex: ^iscsid
     enabled: "{{ kolla_enable_iscsid | bool }}"
-  - regex: ^kafka
-    enabled: "{{ kolla_enable_kafka | bool }}"
   - regex: ^keepalived
     enabled: "{{ kolla_enable_keepalived | bool }}"
   - regex: ^keystone
     enabled: "{{ kolla_enable_keystone | bool }}"
   - regex: kolla-toolbox
     enabled: True
-  - regex: ^logstash
-    enabled: "{{ kolla_enable_monasca | bool }}"
   - regex: ^kuryr
     enabled: "{{ kolla_enable_kuryr | bool }}"
   - regex: ^magnum
@@ -203,8 +199,6 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_memcached | bool }}"
   - regex: ^mistral
     enabled: "{{ kolla_enable_mistral | bool }}"
-  - regex: monasca
-    enabled: "{{ kolla_enable_monasca | bool }}"
   - regex: ^multipathd
     enabled: "{{ kolla_enable_multipathd | bool }}"
   - regex: ^murano
@@ -249,8 +243,6 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_skydive | bool }}"
   - regex: ^solum
     enabled: "{{ kolla_enable_solum | bool }}"
-  - regex: ^storm
-    enabled: "{{ kolla_enable_storm | bool }}"
   - regex: ^swift
     enabled: "{{ kolla_enable_swift | bool }}"
   - regex: ^tacker
@@ -265,8 +257,6 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_vitrage | bool }}"
   - regex: ^watcher
     enabled: "{{ kolla_enable_watcher | bool }}"
-  - regex: ^zookeeper
-    enabled: "{{ kolla_enable_zookeeper | bool }}"
   - regex: ^zun
     enabled: "{{ kolla_enable_zun | bool }}"
 
@@ -528,21 +518,19 @@ kolla_enable_etcd: "no"
 kolla_enable_fluentd: "yes"
 kolla_enable_freezer: "no"
 kolla_enable_gnocchi: "no"
-kolla_enable_grafana: "{{ kolla_enable_monasca | bool }}"
+kolla_enable_grafana: "no"
 kolla_enable_hacluster: "no"
 kolla_enable_heat: "{{ kolla_enable_openstack_core | bool }}"
 kolla_enable_horizon: "{{ kolla_enable_openstack_core | bool }}"
-kolla_enable_influxdb: "{{ kolla_enable_monasca | bool or kolla_enable_cloudkitty | bool }}"
+kolla_enable_influxdb: "{{ kolla_enable_cloudkitty | bool }}"
 kolla_enable_ironic: "no"
 kolla_enable_ironic_neutron_agent: "{{ kolla_enable_neutron | bool and kolla_enable_ironic | bool }}"
 kolla_enable_iscsid: "{{ kolla_enable_cinder | bool and kolla_enable_cinder_backend_iscsi | bool }}"
-kolla_enable_kafka: "{{ kolla_enable_monasca | bool }}"
 kolla_enable_kuryr: "no"
 kolla_enable_magnum: "no"
 kolla_enable_manila: "no"
 kolla_enable_masakari: "no"
 kolla_enable_mistral: "no"
-kolla_enable_monasca: "no"
 kolla_enable_multipathd: "no"
 kolla_enable_murano: "no"
 kolla_enable_neutron_mlnx: "no"
@@ -564,14 +552,12 @@ kolla_enable_sahara: "no"
 kolla_enable_senlin: "no"
 kolla_enable_skydive: "no"
 kolla_enable_solum: "no"
-kolla_enable_storm: "{{ kolla_enable_monasca | bool }}"
 kolla_enable_swift: "no"
 kolla_enable_tacker: "no"
 kolla_enable_telegraf: "no"
 kolla_enable_trove: "no"
 kolla_enable_vitrage: "no"
 kolla_enable_watcher: "no"
-kolla_enable_zookeeper: "{{ kolla_enable_kafka | bool or kolla_enable_storm | bool }}"
 kolla_enable_zun: "no"
 
 ###############################################################################

ansible/inventory/group_vars/all/monasca

@@ -1,12 +0,0 @@
----
-###############################################################################
-# Monasca configuration.
-
-# Monasca OpenStack Project name.
-monasca_control_plane_project: "monasca_control_plane"
-
-# Monasca OpenStack Domain name.
-monasca_control_plane_domain: "default"
-
-# Monasca Grafana Server port.
-monasca_grafana_server_port: "3001"

ansible/kolla-openstack.yml

@@ -122,7 +122,6 @@
             - { name: heat, file: heat.conf }
             - { name: inspector, file: ironic-inspector.conf }
             - { name: ironic, file: ironic.conf }
-            - { name: kafka, file: kafka.server.properties }
             - { name: keystone, file: keystone.conf }
             - { name: magnum, file: magnum.conf }
             - { name: manila, file: manila.conf }
@@ -136,7 +135,6 @@
             - { name: octavia, file: octavia.conf }
             - { name: placement, file: placement.conf }
             - { name: sahara, file: sahara.conf }
-            - { name: zookeeper, file: zookeeper.cfg }
 
         - name: Initialise a fact containing extra configuration
           set_fact:
@@ -233,7 +231,6 @@
       kolla_extra_heat: "{{ kolla_extra_config.heat | default }}"
       kolla_extra_inspector: "{{ kolla_extra_config.inspector | default }}"
       kolla_extra_ironic: "{{ kolla_extra_config.ironic | default }}"
-      kolla_extra_kafka: "{{ kolla_extra_config.kafka | default }}"
       kolla_extra_keystone: "{{ kolla_extra_config.keystone | default }}"
       kolla_extra_magnum: "{{ kolla_extra_config.magnum | default }}"
       kolla_extra_manila: "{{ kolla_extra_config.manila | default }}"
@@ -247,7 +244,6 @@
       kolla_extra_octavia: "{{ kolla_extra_config.octavia | default }}"
       kolla_extra_placement: "{{ kolla_extra_config.placement | default }}"
       kolla_extra_sahara: "{{ kolla_extra_config.sahara | default }}"
-      kolla_extra_zookeeper: "{{ kolla_extra_config.zookeeper | default }}"
       kolla_extra_config_path: "{{ kayobe_env_config_path }}/kolla/config"
       kolla_libvirt_tls: "{{ compute_libvirt_enable_tls | bool }}"
       kolla_nova_libvirt_certificates_src: "{{ kayobe_env_config_path }}/certificates/libvirt"

ansible/overcloud-grafana-configure.yml

@@ -1,76 +0,0 @@
----
-- name: Check whether Monasca is enabled
-  hosts: overcloud
-  gather_facts: False
-  tags:
-    - grafana
-  tasks:
-    - name: Create monitoring group with grafana enabled
-      group_by:
-        key: "monitoring_with_grafana_enabled_{{ kolla_enable_monasca | bool }}"
-      changed_when: false
-
-- name: Set the Monasca control plane project ID
-  hosts: monitoring_with_grafana_enabled_True[0]
-  tags:
-    - grafana
-  vars:
-    venv: "{{ virtualenv_path }}/openstacksdk"
-  pre_tasks:
-    - name: Validate OpenStack password authentication parameters
-      fail:
-        msg: >
-          Required OpenStack authentication parameter {{ item }} is
-          {% if item in openstack_auth %}empty{% else %}not present{% endif %}
-          in openstack_auth. Have you sourced the environment file?
-      when:
-        - openstack_auth_type == 'password'
-        - item not in openstack_auth or not openstack_auth[item]
-      with_items: "{{ openstack_auth_password_required_params }}"
-      tags:
-        - config-validation
-
-  roles:
-    - role: stackhpc.os-openstackclient
-      os_openstackclient_venv: "{{ venv }}"
-      os_openstackclient_install_epel: "{{ dnf_install_epel }}"
-      os_openstackclient_state: latest
-      os_openstackclient_upper_constraints_file: "{{ pip_upper_constraints_file }}"
-      when: kolla_enable_monasca | bool
-
-  tasks:
-    - name: Look up Monasca control plane project ID
-      shell: >
-        . {{ venv }}/bin/activate &&
-        openstack project show {{ monasca_control_plane_project }} --format json --column id
-      register: monasca_project_show
-      changed_when: False
-      environment: "{{ openstack_auth_env }}"
-      when: kolla_enable_monasca | bool
-
-    - name: Set Monasca control plane ID
-      set_fact:
-        monasca_control_plane_project_id:  "{{ (monasca_project_show.stdout | from_json).get('id') }}"
-      when: kolla_enable_monasca | bool
-
-- name: Configure control plane monitoring for Grafana
-  # Only required to run on a single host.
-  hosts: monitoring_with_grafana_enabled_True[0]
-  gather_facts: False
-  tags:
-    - grafana
-  pre_tasks:
-    - name: Include Kolla passwords for Grafana local admin account credentials
-      include_vars: "{{ kayobe_env_config_path }}/kolla/passwords.yml"
-  roles:
-    - role: stackhpc.grafana-conf
-      grafana_conf_organisation: "{{ grafana_control_plane_organisation }}"
-      grafana_conf_grafana_admin_user: "{{ grafana_local_admin_user_name }}"
-      grafana_conf_grafana_admin_pass: "{{ monasca_grafana_admin_password }}"
-      grafana_conf_grafana_dashboard_repo:
-        repo: "{{ grafana_monitoring_node_dashboard_repo }}"
-        version: "{{ grafana_monitoring_node_dashboard_repo_version }}"
-        checkout_path: "{{ grafana_monitoring_node_dashboard_repo_checkout_path }}"
-        relative_path: "{{ grafana_monitoring_node_dashboard_repo_path }}"
-      grafana_conf_grafana_url: "http://{{ kolla_internal_vip_address }}:{{ monasca_grafana_server_port }}"
-      grafana_conf_grafana_datasources: "{{ grafana_datasources }}"

ansible/roles/kolla-ansible/defaults/main.yml

@@ -210,12 +210,10 @@ kolla_openstack_logging_debug:
 #kolla_enable_horizon:
 #kolla_enable_influxdb:
 #kolla_enable_ironic:
-#kolla_enable_kafka:
 #kolla_enable_kuryr:
 #kolla_enable_magnum:
 #kolla_enable_manila:
 #kolla_enable_mistral:
-#kolla_enable_monasca:
 #kolla_enable_murano:
 #kolla_enable_multipathd:
 #kolla_enable_neutron_dvr:
@@ -225,11 +223,9 @@ kolla_openstack_logging_debug:
 #kolla_enable_prometheus:
 #kolla_enable_sahara:
 #kolla_enable_senlin:
-#kolla_enable_storm:
 #kolla_enable_swift:
 #kolla_enable_telegraf:
 #kolla_enable_watcher:
-#kolla_enable_zookeeper:
 
 #######################
 # Nova options

ansible/roles/kolla-ansible/templates/kolla/globals.yml

@@ -529,6 +529,8 @@ ironic_inspector_kernel_cmdline_extras:
 # in the Grafana database, breaking the local admin account, and
 # preventing admin API calls to Grafana. To reduce the chance of this
 # happening the local admin account is renamed here.
+# NOTE(priteau): This is kept for compatibility purpose until we validate
+# reverting to the original admin user.
 {% if kolla_enable_grafana and grafana_local_admin_user_name is defined %}
 grafana_admin_username: "{{ grafana_local_admin_user_name }}"
 {% endif %}

ansible/roles/kolla-ansible/tests/test-defaults.yml

@@ -102,15 +102,11 @@
               - enable_glance
               - enable_ironic
               - enable_ironic_neutron_agent
-              - enable_kafka
               - enable_influxdb
               - enable_mariadb
-              - enable_monasca
               - enable_neutron
               - enable_nova
               - enable_prometheus
-              - enable_storm
-              - enable_zookeeper
               - grafana_admin_username
               - network_interface
               - api_interface

ansible/roles/kolla-ansible/tests/test-extras.yml

@@ -151,7 +151,6 @@
             kolla_enable_influxdb: True
             kolla_enable_ironic: True
             kolla_enable_ironic_neutron_agent: True
-            kolla_enable_kafka: True
             kolla_enable_kuryr: True
             kolla_enable_magnum: True
             kolla_enable_manila: True
@@ -159,7 +158,6 @@
             kolla_enable_manila_backend_hnas: True
             kolla_enable_mariadb: True
             kolla_enable_mistral: True
-            kolla_enable_monasca: True
             kolla_enable_multipathd: True
             kolla_enable_murano: True
             kolla_enable_neutron_agent_ha: True
@@ -178,13 +176,11 @@
             kolla_enable_senlin: True
             kolla_enable_skydive: True
             kolla_enable_solum: True
-            kolla_enable_storm: True
             kolla_enable_swift: True
             kolla_enable_tacker: True
             kolla_enable_telegraf: True
             kolla_enable_trove: True
             kolla_enable_watcher: True
-            kolla_enable_zookeeper: True
             kolla_enable_zun: True
             kolla_globals_paths_extra:
               - "{{ tempfile_result.path ~ '/etc/kayobe/' }}"
@@ -276,7 +272,6 @@
               #enable_influxdb: True
               #enable_ironic: True
               #enable_ironic_neutron_agent: True
-              #enable_kafka: True
               #enable_kuryr: True
               #enable_magnum: True
               #enable_manila: True
@@ -284,7 +279,6 @@
               #enable_manila_backend_hnas: True
               #enable_mariadb: True
               #enable_mistral: True
-              #enable_monasca: True
               #enable_multipathd: True
               #enable_murano: True
               #enable_neutron_agent_ha: True
@@ -303,13 +297,11 @@
               #enable_senlin: True
               #enable_skydive: True
               #enable_solum: True
-              #enable_storm: True
               #enable_swift: True
               #enable_tacker: True
               #enable_telegraf: True
               #enable_trove: True
               #enable_watcher: True
-              #enable_zookeeper: True
               #enable_zun: True
               extra-global-1: "extra-val-1"
               extra-global-2: "extra-val-2"

ansible/roles/kolla-openstack/defaults/main.yml

@@ -316,15 +316,6 @@ kolla_inspector_swift_auth: {}
 # Free form extra configuration to append to ironic-inspector.conf.
 kolla_extra_inspector:
 
-###############################################################################
-# Kafka configuration.
-
-# Whether to enable Kafka.
-kolla_enable_kafka:
-
-# Free form extra configuration to append to kafka.server.properties.
-kolla_extra_kafka:
-
 ###############################################################################
 # Magnum configuration.
 
@@ -367,12 +358,6 @@ kolla_enable_masakari:
 # Free form extra configuration to append to masakari.conf.
 kolla_extra_masakari:
 
-###############################################################################
-# Monasca configuration.
-
-# Whether to enable Monasca.
-kolla_enable_monasca:
-
 ###############################################################################
 # Murano configuration.
 
@@ -483,23 +468,8 @@ kolla_enable_sahara:
 # Free form extra configuration to append to sahara.conf.
 kolla_extra_sahara:
 
-###############################################################################
-# Storm configuration.
-
-# Whether to enable Storm.
-kolla_enable_storm:
-
 ###############################################################################
 # Swift configuration.
 
 # Whether to enable swift.
 kolla_enable_swift:
-
-###############################################################################
-# Zookeeper configuration.
-
-# Whether to enable Zookeeper.
-kolla_enable_zookeeper:
-
-# Free form extra configuration to append to zookeeper.cfg.
-kolla_extra_zookeeper:

ansible/roles/kolla-openstack/molecule/default/tests/test_default.py

@@ -46,21 +46,17 @@ def test_service_config_directory(host, path):
      'heat',
      'horizon',
      'ironic',
-     'kafka',
      'keystone',
      'magnum',
      'manila',
      'mariadb',
      'masakari',
-     'monasca',
      'murano',
      'neutron',
      'nova',
      'prometheus',
      'sahara',
-     'storm',
+     'swift'])
-     'swift',
-     'zookeeper'])
 def test_service_config_directory_absent(host, path):
     path = os.path.join('/etc/kolla/config', path)
     utils.test_path_absent(host, path)

ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml

@@ -74,10 +74,6 @@ provisioner:
           foo=bar
         kolla_inspector_ipa_kernel_path: ${MOLECULE_TEMP_PATH:-/tmp}/ironic-agent.kernel
         kolla_inspector_ipa_ramdisk_path: ${MOLECULE_TEMP_PATH:-/tmp}/ironic-agent.initramfs
-        kolla_enable_kafka: true
-        kolla_extra_kafka: |
-          [extra-kafka.server.properties]
-          foo=bar
         kolla_enable_keystone: true
         kolla_extra_keystone: |
           [extra-keystone.conf]
@@ -102,7 +98,6 @@ provisioner:
         kolla_extra_masakari: |
           [extra-masakari.conf]
           foo=bar
-        kolla_enable_monasca: true
         kolla_enable_murano: true
         kolla_extra_murano: |
           [extra-murano.conf]
@@ -136,11 +131,6 @@ provisioner:
           [extra-sahara.conf]
           foo=bar
         kolla_enable_swift: true
-        kolla_enable_storm: true
-        kolla_enable_zookeeper: true
-        kolla_extra_zookeeper: |
-          [extra-zookeeper.cfg]
-          foo=bar
   lint:
     name: ansible-lint
 scenario:

ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py

@@ -40,13 +40,11 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
      'heat',
      'horizon',
      'ironic',
-     'kafka',
      'keystone',
      'magnum',
      'manila',
      'mariadb',
      'masakari',
-     'monasca',
      'murano',
      'neutron',
      'nova',
@@ -55,9 +53,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
      'placement',
      'prometheus',
      'sahara',
-     'storm',
+     'swift'])
-     'swift',
-     'zookeeper'])
 def test_service_config_directory(host, path):
     path = os.path.join('/etc/kolla/config', path)
     utils.test_directory(host, path)
@@ -76,7 +72,6 @@ def test_service_config_directory(host, path):
      'heat.conf',
      'ironic.conf',
      'ironic-inspector.conf',
-     'kafka.server.properties',
      'keystone.conf',
      'magnum.conf',
      'manila.conf',
@@ -88,8 +83,7 @@ def test_service_config_directory(host, path):
      'octavia.conf',
      'placement.conf',
      'sahara.conf',
-     'backup.my.cnf',
+     'backup.my.cnf'])
-     'zookeeper.cfg'])
 def test_service_ini_file(host, path):
     # TODO(mgoddard): Check more of config file contents.
     path = os.path.join('/etc/kolla/config', path)

ansible/roles/kolla-openstack/tasks/config.yml

@@ -28,7 +28,6 @@
     - { src: heat.conf.j2, dest: heat.conf, enabled: "{{ kolla_enable_heat }}" }
     - { src: ironic.conf.j2, dest: ironic.conf, enabled: "{{ kolla_enable_ironic }}" }
     - { src: ironic-inspector.conf.j2, dest: ironic-inspector.conf, enabled: "{{ kolla_enable_ironic }}" }
-    - { src: kafka.server.properties.j2, dest: kafka.server.properties, enabled: "{{ kolla_enable_kafka }}" }
     - { src: keystone.conf.j2, dest: keystone.conf, enabled: "{{ kolla_enable_keystone }}" }
     - { src: magnum.conf.j2, dest: magnum.conf, enabled: "{{ kolla_enable_magnum }}" }
     - { src: manila.conf.j2, dest: manila.conf, enabled: "{{ kolla_enable_manila }}" }
@@ -41,7 +40,6 @@
     - { src: octavia.conf.j2, dest: octavia.conf, enabled: "{{ kolla_enable_octavia }}" }
     - { src: placement.conf.j2, dest: placement.conf, enabled: "{{ kolla_enable_placement }}" }
     - { src: sahara.conf.j2, dest: sahara.conf, enabled: "{{ kolla_enable_sahara }}" }
-    - { src: zookeeper.cfg.j2, dest: zookeeper.cfg, enabled: "{{ kolla_enable_zookeeper }}" }
   when: item.enabled | bool
 
 - name: Ensure ironic inspector kernel and ramdisk images are present

ansible/roles/kolla-openstack/templates/kafka.server.properties.j2

@@ -1,9 +0,0 @@
-# {{ ansible_managed }}
-
-{% if kolla_extra_kafka %}
-#######################
-# Extra configuration
-#######################
-
-{{ kolla_extra_kafka }}
-{% endif %}

ansible/roles/kolla-openstack/templates/zookeeper.cfg.j2

@@ -1,9 +0,0 @@
-# {{ ansible_managed }}
-
-{% if kolla_extra_zookeeper %}
-#######################
-# Extra configuration
-#######################
-
-{{ kolla_extra_zookeeper }}
-{% endif %}

ansible/roles/kolla-openstack/vars/main.yml

@@ -101,11 +101,6 @@ kolla_openstack_custom_config:
     dest: "{{ kolla_node_custom_config_path }}/"
     patterns: "influx*"
     enabled: "{{ kolla_enable_influxdb }}"
-  # Storm.
-  - src: "{{ kolla_extra_config_path }}/storm"
-    dest: "{{ kolla_node_custom_config_path }}/storm"
-    patterns: "*"
-    enabled: "{{ kolla_enable_storm }}"
   # Ironic.
   - src: "{{ kolla_extra_config_path }}/ironic"
     dest: "{{ kolla_node_custom_config_path }}/ironic"
@@ -115,11 +110,6 @@ kolla_openstack_custom_config:
       # These are templated by kayobe, so don't remove them.
       - ironic-agent.initramfs
       - ironic-agent.kernel
-  # Kafka.
-  - src: "{{ kolla_extra_config_path }}/kafka"
-    dest: "{{ kolla_node_custom_config_path }}/kafka"
-    patterns: "*"
-    enabled: "{{ kolla_enable_kafka }}"
   # Keystone.
   - src: "{{ kolla_extra_config_path }}/keystone"
     dest: "{{ kolla_node_custom_config_path }}/keystone"
@@ -150,11 +140,6 @@ kolla_openstack_custom_config:
     dest: "{{ kolla_node_custom_config_path }}/masakari"
     patterns: "*"
     enabled: "{{ kolla_enable_masakari }}"
-  # Monasca.
-  - src: "{{ kolla_extra_config_path }}/monasca"
-    dest: "{{ kolla_node_custom_config_path }}/monasca"
-    patterns: "*"
-    enabled: "{{ kolla_enable_monasca }}"
   # Murano.
   - src: "{{ kolla_extra_config_path }}/murano"
     dest: "{{ kolla_node_custom_config_path }}/murano"
@@ -235,8 +220,3 @@ kolla_openstack_custom_config:
       - container.ring.gz
       - object.builder
       - object.ring.gz
-  # Zookeeper.
-  - src: "{{ kolla_extra_config_path }}/zookeeper"
-    dest: "{{ kolla_node_custom_config_path }}/zookeeper"
-    patterns: "*"
-    enabled: "{{ kolla_enable_zookeeper }}"

doc/source/configuration/reference/kolla-ansible.rst

@@ -696,8 +696,6 @@ which files are supported.
    ``ironic-inspector.conf``       Ironic inspector configuration.
    ``ironic.conf``                 Ironic configuration.
    ``ironic/*``                    Extended ironic configuration.
-   ``kafka.server.properties``     Kafka configuration.
-   ``kafka/*``                     Extended Kafka configuration.
    ``keepalived/*``                Extended keepalived configuration.
    ``keystone.conf``               Keystone configuration.
    ``keystone/*``                  Extended keystone configuration.
@@ -708,7 +706,6 @@ which files are supported.
    ``mariadb/*``                   Extended MariaDB configuration.
    ``masakari.conf``               Masakari configuration.
    ``masakari/*``                  Extended masakari configuration.
-   ``monasca/*``                   Extended Monasca configuration.
    ``murano.conf``                 Murano configuration.
    ``murano/*``                    Extended murano configuration.
    ``neutron.conf``                Neutron configuration.
@@ -724,10 +721,7 @@ which files are supported.
    ``prometheus/*``                Prometheus configuration.
    ``sahara.conf``                 Sahara configuration.
    ``sahara/*``                    Extended sahara configuration.
-   ``storm/*``                     Extended Storm configuration.
    ``swift/*``                     Extended swift configuration.
-   ``zookeeper.cfg``               Zookeeper configuration.
-   ``zookeeper/*``                 Extended Zookeeper configuration.
    =============================== =======================================================
 
 Configuring an OpenStack Component

etc/kayobe/grafana.yml

@@ -6,42 +6,6 @@
 # should not conflict with an OpenStack user name.
 #grafana_local_admin_user_name:
 
-# Path to git repo containing Grafana dashboards. Eg.
-# https://github.com/stackhpc/grafana-reference-dashboards.git
-#grafana_monitoring_node_dashboard_repo:
-
-# Dashboard repo version. Optional, defaults to 'HEAD'.
-#grafana_monitoring_node_dashboard_repo_version:
-
-# Path to which Grafana dashboards will be cloned to a monitoring node
-#grafana_monitoring_node_dashboard_repo_checkout_path:
-
-# The path, relative to the grafana_monitoring_node_dashboard_repo_checkout_path
-# containing the dashboards. Eg. /prometheus/control_plane
-#grafana_monitoring_node_dashboard_repo_path:
-
-# The Grafana organisation for the control plane. Note that for Monasca
-# Grafana with domain support the format is:
-# organisation_name@openstack_domain
-#grafana_control_plane_organisation:
-
-# A dict of datasources to configure. See the stackhpc.grafana-conf role
-# for all supported datasources. Example:
-#
-# grafana_datasources:
-#   monasca_api:
-#     port: 8082
-#     host: monasca-api
-#   monasca_log_api:
-#     port: 5607
-#     host: monasca-log-api
-#   elasticsearch:
-#     port: 9200
-#     host: monasca-elasticsearch
-#     project_id: "some_id"
-#
-#grafana_datasources:
-
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

etc/kayobe/monasca.yml

@@ -1,18 +0,0 @@
----
-###############################################################################
-# Monasca configuration.
-
-# Monasca OpenStack Project name.
-# The default is "monasca_control_plane".
-#monasca_control_plane_project:
-
-# Monasca OpenStack Domain name. Default is "default".
-#monasca_control_plane_domain:
-
-# Monasca Grafana Server port. Must match kolla-ansible
-# var of the same name. Default is "3001".
-#monasca_grafana_server_port:
-
-###############################################################################
-# Dummy variable to allow Ansible to accept this file.
-workaround_ansible_issue_8743: yes

kayobe/cli/commands.py

@@ -1804,7 +1804,6 @@ class OvercloudPostConfigure(KayobeAnsibleMixin, VaultMixin, Command):
     * Register ironic inspector introspection rules with the overcloud
       inspector service.
     * Register a provisioning network with neutron.
-    * Configure Grafana for control plane.
     * Configure serial consoles for the ironic nodes
     """
 
@@ -1813,8 +1812,7 @@ class OvercloudPostConfigure(KayobeAnsibleMixin, VaultMixin, Command):
         playbooks = _build_playbook_list(
             "overcloud-ipa-images", "overcloud-introspection-rules",
             "overcloud-introspection-rules-dell-lldp-workaround",
-            "provision-net", "overcloud-grafana-configure",
+            "provision-net", "baremetal-compute-serial-console-post-config")
-            "baremetal-compute-serial-console-post-config")
         self.run_kayobe_playbooks(parsed_args, playbooks)
 
 

kayobe/tests/unit/cli/test_commands.py

@@ -2229,8 +2229,6 @@ class TestCase(unittest.TestCase):
                         "ansible", "overcloud-introspection-rules.yml"),
                     utils.get_data_files_path("ansible", "overcloud-introspection-rules-dell-lldp-workaround.yml"),  # noqa
                     utils.get_data_files_path("ansible", "provision-net.yml"),
-                    utils.get_data_files_path(
-                        "ansible", "overcloud-grafana-configure.yml"),
                     utils.get_data_files_path(
                         "ansible", "baremetal-compute-serial-console-post-config.yml"),  # noqa
                 ],

releasenotes/notes/deprecate-monasca-1f83e043e0f59daa.yaml

@@ -1,6 +0,0 @@
----
-deprecations:
-  - |
-    Deprecates support for deploying Monasca and dependent services:
-    Kafka, Storm and Zookeeper. The support will be removed in the
-    Antelope cycle.

releasenotes/notes/overcloud-post-configure-grafana-dea6182d3f856319.yaml

@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    Removes support for configuring Grafana with ``kayobe overcloud post
+    configure``. See the `Kolla Ansible documentation
+    <https://docs.openstack.org/kolla-ansible/zed/reference/logging-and-monitoring/grafana-guide.html>`__
+    for an alternative method of loading dashboards.

releasenotes/notes/remove-monasca-and-deps-1f83e043e0f59daa.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Removes support for deploying Monasca and its dependencies (Kafka, Storm
+    and Zookeeper).