Synchronise master with upstream

.ansible-lint

@@ -19,6 +19,5 @@ skip_list:
   # Role names
   - role-name
   - var-naming[no-role-prefix]
-  - yaml[line-length]
 
 use_default_rules: true

README.rst

@@ -73,8 +73,6 @@ Infrastructure components
 Kolla Ansible deploys containers for the following infrastructure components:
 
 - `Collectd <https://collectd.org/>`__,
-  `Telegraf <https://docs.influxdata.com/telegraf/>`__,
-  `InfluxDB <https://www.influxdata.com/products/influxdb-overview/>`__,
   `Prometheus <https://prometheus.io/>`__, and
   `Grafana <https://grafana.com/>`__ for performance monitoring.
 - `OpenSearch <https://opensearch.org/docs/latest/>`__ and

ansible/group_vars/all/cloudkitty.yml

@@ -4,12 +4,7 @@ enable_cloudkitty: false
 #######################
 # Cloudkitty options
 #######################
-# Valid options are 'sqlalchemy' or 'influxdb'. The default value is
-# 'influxdb', which matches the default in Cloudkitty since the Stein release.
-# When the backend is "influxdb", we also enable Influxdb.
-# Also, when using 'influxdb' as the backend, we trigger the configuration/use
-# of Cloudkitty storage backend version 2.
-cloudkitty_storage_backend: "influxdb"
+cloudkitty_storage_backend: "sqlalchemy"
 
 cloudkitty_internal_fqdn: "{{ kolla_internal_fqdn }}"
 cloudkitty_external_fqdn: "{{ kolla_external_fqdn }}"

ansible/inventory/all-in-one

@@ -44,13 +44,6 @@ monitoring
 [etcd:children]
 control
 
-[telegraf:children]
-compute
-control
-monitoring
-network
-storage
-
 [hacluster:children]
 control
 
@@ -104,9 +97,6 @@ control
 [ironic:children]
 control
 
-[influxdb:children]
-monitoring
-
 [prometheus:children]
 monitoring
 

ansible/inventory/multinode

@@ -62,19 +62,9 @@ monitoring
 [etcd:children]
 control
 
-[influxdb:children]
-monitoring
-
 [prometheus:children]
 monitoring
 
-[telegraf:children]
-compute
-control
-monitoring
-network
-storage
-
 [hacluster:children]
 control
 

ansible/roles/cloudkitty/defaults/main.yml

@@ -154,21 +154,6 @@ cloudkitty_custom_metrics_yaml_file: "metrics.yml"
 ####################
 # Storage backend
 ####################
-# InfluxDB retention policy to use (defaults to autogen).
-# cloudkitty_influxdb_retention_policy: "autogen"
-
-# Set to true to use SSL for InfluxDB connections.
-cloudkitty_influxdb_use_ssl: "{{ kolla_enable_tls_internal }}"
-
-# Path of the CA certificate to trust for HTTPS connections.
-cloudkitty_influxdb_cafile: "{{ openstack_cacert }}"
-
-# Set to true to authorize insecure HTTPS connections to InfluxDB.
-# This means, HTTPS connections without validating the certificate used by InfluxDB
-# cloudkitty_influxdb_insecure_connections: false
-
-cloudkitty_influxdb_name: "cloudkitty"
-
 # Set the elasticsearch/opensearch index name.
 cloudkitty_elasticsearch_index_name: "cloudkitty"
 cloudkitty_opensearch_index_name: "{{ cloudkitty_elasticsearch_index_name }}"

ansible/roles/cloudkitty/tasks/bootstrap.yml

@@ -37,23 +37,6 @@
   when:
     - not use_preconfigured_databases | bool
 
-- name: Creating Cloudkitty influxdb database
-  become: true
-  kolla_toolbox:
-    container_engine: "{{ kolla_container_engine }}"
-    module_name: influxdb_database
-    module_args:
-      hostname: "{{ influxdb_address }}"
-      port: "{{ influxdb_http_port }}"
-      ssl: "{{ cloudkitty_influxdb_use_ssl | bool }}"
-      database_name: "{{ cloudkitty_influxdb_name }}"
-      # The influxdb_database module and the InfluxDB 1.x Python client don't
-      # support specifying a CA certificate file.
-      validate_certs: false
-  run_once: true
-  delegate_to: "{{ groups['cloudkitty-api'][0] }}"
-  when: cloudkitty_storage_backend == 'influxdb'
-
 - name: Checking if Cloudkitty elasticsearch index exists
   become: true
   kolla_toolbox:

ansible/roles/cloudkitty/templates/cloudkitty.conf.j2

@@ -132,30 +132,6 @@ version = 1
 version = 2
 {% endif %}
 
-{% if cloudkitty_storage_backend == 'influxdb' %}
-[storage_influxdb]
-database = {{ cloudkitty_influxdb_name }}
-host = {{ influxdb_address }}
-port = {{ influxdb_http_port }}
-
-{%     if cloudkitty_influxdb_retention_policy is defined %}
-retention_policy = {{ cloudkitty_influxdb_retention_policy }}
-{%     endif %}
-
-{%     if cloudkitty_influxdb_use_ssl is defined %}
-use_ssl = {{ cloudkitty_influxdb_use_ssl }}
-{%     endif %}
-
-{%     if cloudkitty_influxdb_insecure_connections is defined %}
-insecure = {{ cloudkitty_influxdb_insecure_connections }}
-{%     endif %}
-
-{%     if cloudkitty_influxdb_cafile is defined %}
-cafile = {{ cloudkitty_influxdb_cafile }}
-{%     endif %}
-
-{% endif %}
-
 {% if cloudkitty_storage_backend == 'elasticsearch' %}
 [storage_elasticsearch]
 host = {{ cloudkitty_elasticsearch_url }}

ansible/roles/cron/tasks/config.yml

@@ -52,7 +52,6 @@
       - { name: "haproxy", enabled: "{{ enable_haproxy | bool }}" }
       - { name: "heat", enabled: "{{ enable_heat | bool }}" }
       - { name: "horizon", enabled: "{{ enable_horizon | bool }}" }
-      - { name: "influxdb", enabled: "{{ enable_influxdb | bool }}" }
       - { name: "ironic", enabled: "{{ enable_ironic | bool }}" }
       - { name: "keystone", enabled: "{{ enable_keystone | bool }}" }
       - { name: "kuryr", enabled: "{{ enable_kuryr | bool }}" }

ansible/roles/destroy/tasks/cleanup_host.yml

@@ -7,7 +7,6 @@
     glance_file_datadir_volume: "{{ glance_file_datadir_volume }}"
     nova_instance_datadir_volume: "{{ nova_instance_datadir_volume }}"
     gnocchi_metric_datadir_volume: "{{ gnocchi_metric_datadir_volume }}"
-    influxdb_datadir_volume: "{{ influxdb_datadir_volume }}"
     kolla_internal_vip_address: "{{ kolla_internal_vip_address }}"
     kolla_external_vip_address: "{{ kolla_external_vip_address }}"
     kolla_dev_repos_directory: "{{ kolla_dev_repos_directory }}"

ansible/roles/grafana/defaults/main.yml

@@ -53,16 +53,6 @@ grafana_database_shard:
 # Datasource
 ####################
 grafana_data_sources:
-  influxdb:
-    enabled: "{{ enable_influxdb | bool }}"
-    data:
-      isDefault: true
-      database: "telegraf"
-      name: "telegraf"
-      type: "influxdb"
-      url: "{{ influxdb_internal_endpoint }}"
-      access: "proxy"
-      basicAuth: false
   opensearch:
     enabled: "{{ enable_opensearch | bool }}"
     data:

ansible/roles/grafana/templates/grafana.ini.j2

@@ -30,3 +30,7 @@ check_for_updates = false
 [security]
 admin_user = {{ grafana_admin_username }}
 admin_password = {{ grafana_admin_password }}
+
+[plugins]
+plugin_admin_enabled = false
+public_key_retrieval_disabled = true