diff options
58 files changed, 20 insertions, 760 deletions
diff --git a/README.rst b/README.rst index 78058b5d2..aacf55d76 100644 --- a/README.rst +++ b/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 diff --git a/ansible/group_vars/all/cloudkitty.yml b/ansible/group_vars/all/cloudkitty.yml index 23f06708c..4eee7a451 100644 --- a/ansible/group_vars/all/cloudkitty.yml +++ b/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 }}" diff --git a/ansible/group_vars/all/influxdb.yml b/ansible/group_vars/all/influxdb.yml deleted file mode 100644 index c6ddb3c99..000000000 --- a/ansible/group_vars/all/influxdb.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -enable_influxdb: "{{ enable_cloudkitty | bool and cloudkitty_storage_backend == 'influxdb' }}" - -#################### -# InfluxDB options -#################### -influxdb_address: "{{ kolla_internal_fqdn }}" -influxdb_datadir_volume: "influxdb" - -influxdb_internal_endpoint: "{{ kolla_internal_fqdn | kolla_url(internal_protocol, influxdb_http_port) }}" - -influxdb_http_port: "8086" diff --git a/ansible/group_vars/all/telegraf.yml b/ansible/group_vars/all/telegraf.yml deleted file mode 100644 index 00d9e4be4..000000000 --- a/ansible/group_vars/all/telegraf.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -enable_telegraf: false - -########## -# Telegraf -########## -# Configure telegraf to use the docker daemon itself as an input for -# telemetry data. -telegraf_enable_docker_input: false diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one index fbd2664ec..da83d2645 100644 --- a/ansible/inventory/all-in-one +++ b/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 diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode index f22d27072..4851f8eef 100644 --- a/ansible/inventory/multinode +++ b/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 diff --git a/ansible/roles/cloudkitty/defaults/main.yml b/ansible/roles/cloudkitty/defaults/main.yml index 8f6e53db9..1da04420e 100644 --- a/ansible/roles/cloudkitty/defaults/main.yml +++ b/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 }}" diff --git a/ansible/roles/cloudkitty/tasks/bootstrap.yml b/ansible/roles/cloudkitty/tasks/bootstrap.yml index a4648c489..90ba5e756 100644 --- a/ansible/roles/cloudkitty/tasks/bootstrap.yml +++ b/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: diff --git a/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 b/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 index 7cb08533a..3ac7fdbf3 100644 --- a/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 +++ b/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 @@ -128,30 +128,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 }} diff --git a/ansible/roles/cron/tasks/config.yml b/ansible/roles/cron/tasks/config.yml index 46b606c25..943eda5e1 100644 --- a/ansible/roles/cron/tasks/config.yml +++ b/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 }}" } diff --git a/ansible/roles/cron/templates/cron-logrotate-influxdb.conf.j2 b/ansible/roles/cron/templates/cron-logrotate-influxdb.conf.j2 deleted file mode 100644 index 8a25646d3..000000000 --- a/ansible/roles/cron/templates/cron-logrotate-influxdb.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/influxdb/*.log" -{ -} diff --git a/ansible/roles/destroy/tasks/cleanup_host.yml b/ansible/roles/destroy/tasks/cleanup_host.yml index 4a983956c..2b7087b9e 100644 --- a/ansible/roles/destroy/tasks/cleanup_host.yml +++ b/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 }}" diff --git a/ansible/roles/grafana/defaults/main.yml b/ansible/roles/grafana/defaults/main.yml index e679f9805..05c060883 100644 --- a/ansible/roles/grafana/defaults/main.yml +++ b/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: diff --git a/ansible/roles/influxdb/defaults/main.yml b/ansible/roles/influxdb/defaults/main.yml deleted file mode 100644 index c8a4b5fe0..000000000 --- a/ansible/roles/influxdb/defaults/main.yml +++ /dev/null @@ -1,39 +0,0 @@ ---- -influxdb_services: - influxdb: - container_name: influxdb - group: influxdb - enabled: true - image: "{{ influxdb_image_full }}" - volumes: "{{ influxdb_default_volumes + influxdb_extra_volumes }}" - dimensions: "{{ influxdb_dimensions }}" - haproxy: - influxdb_http: - enabled: "{{ enable_influxdb }}" - mode: "http" - external: false - port: "{{ influxdb_http_port }}" - -#################### -# InfluxDB -#################### - -# Enable the disk based time series index (recommended for all users). For -# more information see here: -# https://docs.influxdata.com/influxdb/v1.7/concepts/time-series-index/ -influxdb_enable_tsi: true - -#################### -# Docker -#################### -influxdb_image: "{{ docker_image_url }}influxdb" -influxdb_tag: "{{ openstack_tag }}" -influxdb_image_full: "{{ influxdb_image }}:{{ influxdb_tag }}" -influxdb_dimensions: "{{ default_container_dimensions }}" - -influxdb_default_volumes: - - "{{ node_config_directory }}/influxdb/:{{ container_config_directory }}/:ro" - - "/etc/localtime:/etc/localtime:ro" - - "{{ influxdb_datadir_volume }}:/var/lib/influxdb" - - "kolla_logs:/var/log/kolla/" -influxdb_extra_volumes: "{{ default_extra_volumes }}" diff --git a/ansible/roles/influxdb/handlers/main.yml b/ansible/roles/influxdb/handlers/main.yml deleted file mode 100644 index c395bc951..000000000 --- a/ansible/roles/influxdb/handlers/main.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- name: Restart influxdb container - vars: - service_name: "influxdb" - service: "{{ influxdb_services[service_name] }}" - become: true - kolla_container: - action: "recreate_or_restart_container" - common_options: "{{ docker_common_options }}" - name: "{{ service.container_name }}" - image: "{{ service.image }}" - volumes: "{{ service.volumes }}" - dimensions: "{{ service.dimensions }}" diff --git a/ansible/roles/influxdb/tasks/check-containers.yml b/ansible/roles/influxdb/tasks/check-containers.yml deleted file mode 100644 index 55b189bbb..000000000 --- a/ansible/roles/influxdb/tasks/check-containers.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: Check influxdb containers - import_role: - name: service-check-containers diff --git a/ansible/roles/influxdb/tasks/check.yml b/ansible/roles/influxdb/tasks/check.yml deleted file mode 100644 index bac2c14f9..000000000 --- a/ansible/roles/influxdb/tasks/check.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: Checking Influxdb containers - import_role: - role: service-check diff --git a/ansible/roles/influxdb/tasks/config.yml b/ansible/roles/influxdb/tasks/config.yml deleted file mode 100644 index 315bdd3b7..000000000 --- a/ansible/roles/influxdb/tasks/config.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- name: Ensuring config directories exist - file: - path: "{{ node_config_directory }}/influxdb" - state: "directory" - owner: "{{ config_owner_user }}" - group: "{{ config_owner_group }}" - mode: "0770" - become: true - with_dict: "{{ influxdb_services | select_services_enabled_and_mapped_to_host }}" - -- name: Copying over config.json files - template: - src: "{{ item.key }}.json.j2" - dest: "{{ node_config_directory }}/influxdb/config.json" - mode: "0660" - become: true - with_dict: "{{ influxdb_services | select_services_enabled_and_mapped_to_host }}" - -- name: Copying over influxdb config file - vars: - service: "{{ influxdb_services['influxdb'] }}" - template: - src: "{{ item }}" - dest: "{{ node_config_directory }}/influxdb/influxdb.conf" - mode: "0660" - become: true - when: service | service_enabled_and_mapped_to_host - with_first_found: - - "{{ node_custom_config }}/influxdb/{{ inventory_hostname }}/influxdb.conf" - - "{{ node_custom_config }}/influxdb.conf" - - "influxdb.conf.j2" diff --git a/ansible/roles/influxdb/tasks/config_validate.yml b/ansible/roles/influxdb/tasks/config_validate.yml deleted file mode 100644 index ed97d539c..000000000 --- a/ansible/roles/influxdb/tasks/config_validate.yml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/ansible/roles/influxdb/tasks/deploy-containers.yml b/ansible/roles/influxdb/tasks/deploy-containers.yml deleted file mode 100644 index 3edc66f57..000000000 --- a/ansible/roles/influxdb/tasks/deploy-containers.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: Check influxdb containers - import_tasks: check-containers.yml diff --git a/ansible/roles/influxdb/tasks/deploy.yml b/ansible/roles/influxdb/tasks/deploy.yml deleted file mode 100644 index 31823ae16..000000000 --- a/ansible/roles/influxdb/tasks/deploy.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Configure influxdb - import_tasks: config.yml - -- name: Check influxdb containers - import_tasks: check-containers.yml - -- name: Flush handlers - meta: flush_handlers diff --git a/ansible/roles/influxdb/tasks/loadbalancer.yml b/ansible/roles/influxdb/tasks/loadbalancer.yml deleted file mode 100644 index 8ce5d27a9..000000000 --- a/ansible/roles/influxdb/tasks/loadbalancer.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: "Configure loadbalancer for {{ project_name }}" - import_role: - name: loadbalancer-config - vars: - project_services: "{{ influxdb_services }}" - tags: always diff --git a/ansible/roles/influxdb/tasks/main.yml b/ansible/roles/influxdb/tasks/main.yml deleted file mode 100644 index 7a1d916c4..000000000 --- a/ansible/roles/influxdb/tasks/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: "Include tasks for action {{ kolla_action }}" - include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/influxdb/tasks/precheck.yml b/ansible/roles/influxdb/tasks/precheck.yml deleted file mode 100644 index 2e2f4c6a3..000000000 --- a/ansible/roles/influxdb/tasks/precheck.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -- name: Precheck influxdb configuration - import_role: - name: service-precheck - vars: - service_precheck_services: "{{ influxdb_services }}" - service_name: "{{ project_name }}" - -- name: Get container facts - become: true - kolla_container_facts: - action: get_containers - container_engine: "{{ kolla_container_engine }}" - name: - - influxdb - check_mode: false - register: container_facts - -- name: Checking free port for Influxdb Http - wait_for: - host: "{{ api_interface_address }}" - port: "{{ influxdb_http_port }}" - connect_timeout: 1 - timeout: 1 - state: stopped - when: - - container_facts.containers['influxdb'] is not defined - - inventory_hostname in groups['influxdb'] diff --git a/ansible/roles/influxdb/tasks/pull.yml b/ansible/roles/influxdb/tasks/pull.yml deleted file mode 100644 index e771f7845..000000000 --- a/ansible/roles/influxdb/tasks/pull.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: Pull influxdb images - import_role: - role: service-images-pull diff --git a/ansible/roles/influxdb/tasks/reconfigure.yml b/ansible/roles/influxdb/tasks/reconfigure.yml deleted file mode 100644 index 2e8cc03bd..000000000 --- a/ansible/roles/influxdb/tasks/reconfigure.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: Deploy influxdb - import_tasks: deploy.yml diff --git a/ansible/roles/influxdb/tasks/stop.yml b/ansible/roles/influxdb/tasks/stop.yml deleted file mode 100644 index 7247fabfc..000000000 --- a/ansible/roles/influxdb/tasks/stop.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: Stop influxdb containers - import_role: - name: service-stop - vars: - project_services: "{{ influxdb_services }}" - service_name: "{{ project_name }}" diff --git a/ansible/roles/influxdb/tasks/upgrade.yml b/ansible/roles/influxdb/tasks/upgrade.yml deleted file mode 100644 index 31823ae16..000000000 --- a/ansible/roles/influxdb/tasks/upgrade.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Configure influxdb - import_tasks: config.yml - -- name: Check influxdb containers - import_tasks: check-containers.yml - -- name: Flush handlers - meta: flush_handlers diff --git a/ansible/roles/influxdb/templates/influxdb.conf.j2 b/ansible/roles/influxdb/templates/influxdb.conf.j2 deleted file mode 100644 index 964bac433..000000000 --- a/ansible/roles/influxdb/templates/influxdb.conf.j2 +++ /dev/null @@ -1,53 +0,0 @@ -reporting-disabled = true -[logging] - level = "info" - file = "/var/log/kolla/influxdb/influxdb.log" -[meta] - dir = "/var/lib/influxdb/meta" - retention-autocreate = true - logging-enabled = true -[data] - dir = "/var/lib/influxdb/data" - wal-dir = "/var/lib/influxdb/wal" - wal-logging-enabled = true - data-logging-enabled = true -{% if influxdb_enable_tsi | bool %} - index-version = "tsi1" -{% else %} - index-version = "inmem" -{% endif %} -[coordinator] - write-timeout = "10s" - max-concurrent-queries = 0 - query-timeout = "0s" - max-select-point = 0 - max-select-series = 0 - max-select-buckets = 0 -[retention] - enabled = true - check-interval = "30m" -[shard-precreation] - enabled = true - check-interval = "10m" - advance-period = "30m" -[monitor] - store-enabled = true - store-database = "_internal" - store-interval = "10s" -[http] - enabled = true - bind-address = "{{ api_interface_address | put_address_in_context('url') }}:{{ influxdb_http_port }}" - auth-enabled = false - log-enabled = true - write-tracing = false - pprof-enabled = false - https-enabled = false -[[graphite]] - enabled = false -[[opentsdb]] - enabled = false -[[udp]] - enabled = false -[continuous_queries] - log-enabled = true - enabled = true diff --git a/ansible/roles/influxdb/templates/influxdb.json.j2 b/ansible/roles/influxdb/templates/influxdb.json.j2 deleted file mode 100644 index 3ffa2fe3a..000000000 --- a/ansible/roles/influxdb/templates/influxdb.json.j2 +++ /dev/null @@ -1,23 +0,0 @@ -{ - "command": "/usr/bin/influxd -config /etc/influxdb/influxdb.conf", - "config_files": [ - { - "source": "{{ container_config_directory }}/influxdb.conf", - "dest": "/etc/influxdb/influxdb.conf", - "owner": "influxdb", - "perm": "0600" - } - ], - "permissions": [ - { - "path": "/var/lib/influxdb", - "owner": "influxdb:influxdb", - "recurse": true - }, - { - "path": "/var/log/kolla/influxdb", - "owner": "influxdb:influxdb", - "recurse": true - } - ] -} diff --git a/ansible/roles/influxdb/vars/main.yml b/ansible/roles/influxdb/vars/main.yml deleted file mode 100644 index 9a8a4d186..000000000 --- a/ansible/roles/influxdb/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -project_name: "influxdb" diff --git a/ansible/roles/telegraf/defaults/main.yml b/ansible/roles/telegraf/defaults/main.yml deleted file mode 100644 index ed46711a4..000000000 --- a/ansible/roles/telegraf/defaults/main.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -telegraf_services: - telegraf: - container_name: "telegraf" - image: "{{ telegraf_image_full }}" - enabled: true - pid_mode: "host" - group: "telegraf" - volumes: "{{ telegraf_default_volumes + telegraf_extra_volumes }}" - dimensions: "{{ telegraf_dimensions }}" - -#################### -# Docker -#################### -telegraf_image: "{{ docker_image_url }}telegraf" -telegraf_tag: "{{ openstack_tag }}" -telegraf_image_full: "{{ telegraf_image }}:{{ telegraf_tag }}" -telegraf_dimensions: "{{ default_container_dimensions }}" - -telegraf_default_volumes: - - "{{ node_config_directory }}/telegraf/:{{ container_config_directory }}/:ro" - - "/etc/localtime:/etc/localtime:ro" - - "kolla_logs:/var/log/kolla/" - - "/sys:/rootfs/sys:ro" - - "/proc:/rootfs/proc:ro" - - "/var/run/docker.sock:/var/run/docker.sock:ro" - -telegraf_extra_volumes: "{{ default_extra_volumes }}" - -#################### -# Protocols -#################### -haproxy_proto: "http" -influxdb_proto: "http" -rabbitmq_proto: "http" -mariadb_proto: "tcp" -opensearch_proto: "http" - -################### -# Copy certificates -################### -telegraf_copy_certs: "{{ kolla_copy_ca_into_containers | bool }}" diff --git a/ansible/roles/telegraf/handlers/main.yml b/ansible/roles/telegraf/handlers/main.yml deleted file mode 100644 index 0928b259e..000000000 --- a/ansible/roles/telegraf/handlers/main.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -- name: Restart telegraf container - vars: - service_name: "telegraf" - service: "{{ telegraf_services[service_name] }}" - become: true - kolla_container: - action: "recreate_or_restart_container" - common_options: "{{ docker_common_options }}" - name: "{{ service.container_name }}" - pid_mode: "{{ service.pid_mode }}" - environment: - HOST_PROC: "/rootfs/proc" - HOST_SYS: "/rootfs/sys" - image: "{{ service.image }}" - volumes: "{{ service.volumes | reject('equalto', '') | list }}" - dimensions: "{{ service.dimensions }}" diff --git a/ansible/roles/telegraf/tasks/check-containers.yml b/ansible/roles/telegraf/tasks/check-containers.yml deleted file mode 100644 index 93f665ec6..000000000 --- a/ansible/roles/telegraf/tasks/check-containers.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: Check telegraf containers - import_role: - name: service-check-containers diff --git a/ansible/roles/telegraf/tasks/check.yml b/ansible/roles/telegraf/tasks/check.yml deleted file mode 100644 index 85fa450a5..000000000 --- a/ansible/roles/telegraf/tasks/check.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: Checking Telegraf containers - import_role: - role: service-check diff --git a/ansible/roles/telegraf/tasks/config.yml b/ansible/roles/telegraf/tasks/config.yml deleted file mode 100644 index 0ee22cd13..000000000 --- a/ansible/roles/telegraf/tasks/config.yml +++ /dev/null @@ -1,49 +0,0 @@ ---- -- name: Ensuring config directories exist - file: - path: "{{ node_config_directory }}/{{ item.key }}/config" - state: "directory" - owner: "{{ config_owner_user }}" - group: "{{ config_owner_group }}" - mode: "0770" - become: true - with_dict: "{{ telegraf_services | select_services_enabled_and_mapped_to_host }}" - -- name: Copying over TLS certificates - include_tasks: copy-certs.yml - when: - - telegraf_copy_certs | bool - -- name: Copying over default config.json files - template: - src: "telegraf.json.j2" - dest: "{{ node_config_directory }}/telegraf/config.json" - mode: "0660" - become: true - with_dict: "{{ telegraf_services | select_services_enabled_and_mapped_to_host }}" - -- name: Copying over telegraf config file - vars: - service: "{{ telegraf_services['telegraf'] }}" - template: - src: "{{ item }}" - dest: "{{ node_config_directory }}/telegraf/telegraf.conf" - mode: "0660" - become: true - when: service | service_enabled_and_mapped_to_host - with_first_found: - - "{{ node_custom_config }}/telegraf/{{ inventory_hostname }}/telegraf.conf" - - "{{ node_custom_config }}/telegraf/telegraf.conf" - - "telegraf.conf.j2" - -- name: Copying over telegraf plugin files - vars: - service: "{{ telegraf_services['telegraf'] }}" - copy: - src: "{{ item }}" - dest: "{{ node_config_directory }}/telegraf/config" - mode: "0660" - become: true - when: service | service_enabled_and_mapped_to_host - with_fileglob: - - "{{ role_path }}/templates/config/*.conf" diff --git a/ansible/roles/telegraf/tasks/config_validate.yml b/ansible/roles/telegraf/tasks/config_validate.yml deleted file mode 100644 index ed97d539c..000000000 --- a/ansible/roles/telegraf/tasks/config_validate.yml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/ansible/roles/telegraf/tasks/copy-certs.yml b/ansible/roles/telegraf/tasks/copy-certs.yml deleted file mode 100644 index c73a4313a..000000000 --- a/ansible/roles/telegraf/tasks/copy-certs.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: "Copy certificates and keys for {{ project_name }}" - import_role: - role: service-cert-copy - vars: - project_services: "{{ telegraf_services }}" diff --git a/ansible/roles/telegraf/tasks/deploy-containers.yml b/ansible/roles/telegraf/tasks/deploy-containers.yml deleted file mode 100644 index 40407b946..000000000 --- a/ansible/roles/telegraf/tasks/deploy-containers.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: Check telegraf containers - import_tasks: check-containers.yml diff --git a/ansible/roles/telegraf/tasks/deploy.yml b/ansible/roles/telegraf/tasks/deploy.yml deleted file mode 100644 index 19c0ae97d..000000000 --- a/ansible/roles/telegraf/tasks/deploy.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Configure telegraf - import_tasks: config.yml - -- name: Check telegraf containers - import_tasks: check-containers.yml - -- name: Flush handlers - meta: flush_handlers diff --git a/ansible/roles/telegraf/tasks/main.yml b/ansible/roles/telegraf/tasks/main.yml deleted file mode 100644 index 7a1d916c4..000000000 --- a/ansible/roles/telegraf/tasks/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: "Include tasks for action {{ kolla_action }}" - include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/telegraf/tasks/precheck.yml b/ansible/roles/telegraf/tasks/precheck.yml deleted file mode 100644 index 62592a8fe..000000000 --- a/ansible/roles/telegraf/tasks/precheck.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: Precheck telegraf configuration - import_role: - name: service-precheck - vars: - service_precheck_services: "{{ telegraf_services }}" - service_name: "{{ project_name }}" diff --git a/ansible/roles/telegraf/tasks/pull.yml b/ansible/roles/telegraf/tasks/pull.yml deleted file mode 100644 index f900e77e9..000000000 --- a/ansible/roles/telegraf/tasks/pull.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: Pull telegraf images - import_role: - role: service-images-pull diff --git a/ansible/roles/telegraf/tasks/reconfigure.yml b/ansible/roles/telegraf/tasks/reconfigure.yml deleted file mode 100644 index 7fb58184b..000000000 --- a/ansible/roles/telegraf/tasks/reconfigure.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: Deploy telegraf - import_tasks: deploy.yml diff --git a/ansible/roles/telegraf/tasks/stop.yml b/ansible/roles/telegraf/tasks/stop.yml deleted file mode 100644 index 94d46293a..000000000 --- a/ansible/roles/telegraf/tasks/stop.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: Stop telegraf containers - import_role: - name: service-stop - vars: - project_services: "{{ telegraf_services }}" - service_name: "{{ project_name }}" diff --git a/ansible/roles/telegraf/tasks/upgrade.yml b/ansible/roles/telegraf/tasks/upgrade.yml deleted file mode 100644 index 19c0ae97d..000000000 --- a/ansible/roles/telegraf/tasks/upgrade.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Configure telegraf - import_tasks: config.yml - -- name: Check telegraf containers - import_tasks: check-containers.yml - -- name: Flush handlers - meta: flush_handlers diff --git a/ansible/roles/telegraf/templates/telegraf.conf.j2 b/ansible/roles/telegraf/templates/telegraf.conf.j2 deleted file mode 100644 index 67dcfcdac..000000000 --- a/ansible/roles/telegraf/templates/telegraf.conf.j2 +++ /dev/null @@ -1,106 +0,0 @@ -[global_tags] -[agent] - interval = "10s" - round_interval = true - metric_batch_size = 1000 - metric_buffer_limit = 10000 - collection_jitter = "0s" - flush_interval = "10s" - flush_jitter = "0s" - debug = false - quiet = false - hostname = "" - omit_hostname = false -{% if enable_influxdb | bool %} -{% for host in groups['influxdb'] %} -[[outputs.influxdb]] - urls = ["{{ influxdb_proto }}://{{ 'api' | kolla_address(host) }}:{{ influxdb_http_port }}"] - database = "telegraf" # required - retention_policy = "autogen" - write_consistency = "any" - timeout = "5s" - tls_ca = "{{ openstack_cacert }}" -{% endfor %} -{% endif %} -[[inputs.cpu]] - percpu = true - totalcpu = true - fielddrop = ["time_*"] -{% if enable_collectd | bool and inventory_hostname in groups['collectd'] %} -[[inputs.socket_listener]] - service_address = "udp://{{ 'api' | kolla_address | put_address_in_context('url') }}:{{ collectd_udp_port }}" - name_prefix = "collectd_" - data_format = "collectd" - collectd_typesdb = ["/usr/share/collectd/types.db"] -{% endif %} -[[inputs.disk]] - ignore_fs = ["tmpfs", "devtmpfs"] -[[inputs.diskio]] -{% if inventory_hostname in groups['influxdb'] and enable_influxdb | bool %} -[[inputs.influxdb]] - urls = ["{{ influxdb_proto }}://{{ 'api' | kolla_address | put_address_in_context('url') }}:{{ influxdb_http_port }}/debug/vars"] -{% endif %} -[[inputs.kernel]] -[[inputs.mem]] -[[inputs.processes]] -[[inputs.swap]] -[[inputs.system]] -[[inputs.net]] - interfaces = [] -{% if inventory_hostname in groups['loadbalancer'] and enable_haproxy | bool %} -[[inputs.haproxy]] - servers = ["{{ haproxy_proto }}://{{ haproxy_user }}:{{ haproxy_password }}@{{ api_interface_address | put_address_in_context('url') }}:{{ haproxy_stats_port }}"] -{% endif %} -{% if inventory_hostname in groups['memcached'] and enable_memcached | bool %} -[[inputs.memcached]] - servers = ["{{ api_interface_address | put_address_in_context('url') }}:{{ memcached_port }}"] -{% endif %} -{% if inventory_hostname in groups['opensearch'] and enable_opensearch | bool %} -[[inputs.elasticsearch]] - servers = ["{{ opensearch_proto }}://{{ api_interface_address | put_address_in_context('url') }}:{{ opensearch_port }}"] - local = true - cluster_health = true -{% endif %} -{% if inventory_hostname in groups['rabbitmq'] and enable_rabbitmq | bool %} -[[inputs.rabbitmq]] - url = "{{ rabbitmq_proto }}://{{ api_interface_address | put_address_in_context('url') }}:{{ rabbitmq_management_port }}" - username = "{{ rabbitmq_user }}" - password = "{{ rabbitmq_password }}" -{% endif %} -{% if inventory_hostname in groups['valkey'] and enable_valkey | bool %} -[[inputs.redis]] - servers = ["tcp://:{{ valkey_master_password }}@{{ api_interface_address | put_address_in_context('url') }}:{{ valkey_server_port }}"] -{% endif %} -{% if inventory_hostname in groups['mariadb'] and (enable_mariadb or enable_external_mariadb_load_balancer) | bool %} -[[inputs.mysql]] - servers = ["{{ database_user }}:{{ database_password }}@{{ mariadb_proto }}({{ api_interface_address | put_address_in_context('url') }}:{{ database_port }})/"] - perf_events_statements_digest_text_limit = 120 - perf_events_statements_limit = 250 - perf_events_statements_time_limit = 86400 - table_schema_databases = [] - gather_table_schema = true - gather_process_list = true - gather_info_schema_auto_inc = true - gather_slave_status = true - gather_binary_logs = true - gather_table_io_waits = true - gather_table_lock_waits = true - gather_index_io_waits = true - gather_event_waits = true - gather_file_events_stats = true - gather_perf_events_statements = true - interval_slow = "30m" -{% endif %} -{% if telegraf_enable_docker_input | bool %} -[[inputs.docker]] - endpoint = "unix:///var/run/docker.sock" - gather_services = false - container_names = [] - container_name_include = [] - container_name_exclude = [] - timeout = "5s" - perdevice = true - total = false - docker_label_include = [] - docker_label_exclude = [] -{% endif %} diff --git a/ansible/roles/telegraf/templates/telegraf.json.j2 b/ansible/roles/telegraf/templates/telegraf.json.j2 deleted file mode 100644 index 8e5bd71a4..000000000 --- a/ansible/roles/telegraf/templates/telegraf.json.j2 +++ /dev/null @@ -1,31 +0,0 @@ -{ - "command": "telegraf -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d/", - "config_files": [ - { - "source": "{{ container_config_directory }}/telegraf.conf", - "dest": "/etc/telegraf/telegraf.conf", - "owner": "telegraf", - "perm": "0600" - }, - { - "source": "{{ container_config_directory }}/config/*", - "dest": "/etc/telegraf/telegraf.d/", - "owner": "telegraf", - "perm": "0600", - "optional": true - }{% if kolla_copy_ca_into_containers | bool %}, - { - "source": "{{ container_config_directory }}/ca-certificates", - "dest": "/var/lib/kolla/share/ca-certificates", - "owner": "root", - "perm": "0600" - }{% endif %} - ], - "permissions": [ - { - "path": "/var/log/kolla/telegraf", - "owner": "telegraf:telegraf", - "recurse": true - } - ] -} diff --git a/ansible/roles/telegraf/vars/main.yml b/ansible/roles/telegraf/vars/main.yml deleted file mode 100644 index 2253e26c1..000000000 --- a/ansible/roles/telegraf/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -project_name: "telegraf" diff --git a/ansible/site.yml b/ansible/site.yml index 9cec91e08..4167c041b 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -41,7 +41,6 @@ - enable_hacluster_{{ enable_hacluster | bool }} - enable_heat_{{ enable_heat | bool }} - enable_horizon_{{ enable_horizon | bool }} - - enable_influxdb_{{ enable_influxdb | bool }} - enable_ironic_{{ enable_ironic | bool }} - enable_iscsid_{{ enable_iscsid | bool }} - enable_keystone_{{ enable_keystone | bool }} @@ -68,7 +67,6 @@ - enable_valkey_{{ enable_valkey | bool }} - enable_skyline_{{ enable_skyline | bool }} - enable_tacker_{{ enable_tacker | bool }} - - enable_telegraf_{{ enable_telegraf | bool }} - enable_trove_{{ enable_trove | bool }} - enable_watcher_{{ enable_watcher | bool }} - enable_zun_{{ enable_zun | bool }} @@ -235,12 +233,6 @@ tasks_from: loadbalancer tags: horizon when: enable_horizon | bool - - name: Configure loadbalancer for influxdb - include_role: - name: influxdb - tasks_from: loadbalancer - tags: influxdb - when: enable_influxdb | bool - name: Configure loadbalancer for ironic include_role: name: ironic @@ -426,32 +418,6 @@ roles: - { role: collectd, tags: collectd } -- name: Apply role influxdb - gather_facts: false - hosts: - - influxdb - - "&enable_influxdb_True" - serial: '{{ kolla_serial|default("0") }}' - max_fail_percentage: >- - {{ influxdb_max_fail_percentage | - default(kolla_max_fail_percentage) | - default(100) }} - roles: - - { role: influxdb, tags: influxdb } - -- name: Apply role telegraf - gather_facts: false - hosts: - - telegraf - - "&enable_telegraf_True" - serial: '{{ kolla_serial|default("0") }}' - max_fail_percentage: >- - {{ telegraf_max_fail_percentage | - default(kolla_max_fail_percentage) | - default(100) }} - roles: - - { role: telegraf, tags: telegraf } - - name: Apply role valkey gather_facts: false hosts: diff --git a/doc/source/reference/logging-and-monitoring/grafana-guide.rst b/doc/source/reference/logging-and-monitoring/grafana-guide.rst index 12f123a20..8622b8e99 100644 --- a/doc/source/reference/logging-and-monitoring/grafana-guide.rst +++ b/doc/source/reference/logging-and-monitoring/grafana-guide.rst @@ -9,7 +9,7 @@ Overview `Grafana <https://grafana.com>`_ is open and composable observability and data visualization platform. Visualize metrics, logs, and traces from -multiple sources like Prometheus, Loki, Elasticsearch, InfluxDB, +multiple sources like Prometheus, Loki, Elasticsearch, Postgres and many more.. Preparation and deployment diff --git a/doc/source/reference/logging-and-monitoring/index.rst b/doc/source/reference/logging-and-monitoring/index.rst index 09d017547..05d0b96b7 100644 --- a/doc/source/reference/logging-and-monitoring/index.rst +++ b/doc/source/reference/logging-and-monitoring/index.rst @@ -10,6 +10,5 @@ logging and monitoring services available in kolla. central-logging-guide grafana-guide - influxdb-guide osprofiler-guide prometheus-guide diff --git a/doc/source/reference/logging-and-monitoring/influxdb-guide.rst b/doc/source/reference/logging-and-monitoring/influxdb-guide.rst deleted file mode 100644 index 6bb460d0c..000000000 --- a/doc/source/reference/logging-and-monitoring/influxdb-guide.rst +++ /dev/null @@ -1,28 +0,0 @@ -.. _influxdb-guide: - -=============================== -InfluxDB - Time Series Database -=============================== - -Overview -~~~~~~~~ - -InfluxDB is a time series database developed by InfluxData. It is -possible to deploy a single instance without charge. To use the -clustering features you will require a commercial license. - -InfluxDB -~~~~~~~~ - -The `recommendation <https://docs.influxdata.com/influxdb/v1.7/guides/hardware_sizing/#what-kind-of-storage-do-i-need>`_ -is to use flash storage for InfluxDB. If docker is configured to use -spinning disks by default, or you have some higher performance drives -available, it may be desirable to control where the docker volume is -located. This can be achieved by setting a path for -``influxdb_datadir_volume`` in ``/etc/kolla/globals.yml``: - -.. code-block:: yaml - - influxdb_datadir_volume: /mnt/ssd/influxdb/ - -The default is to use a named volume, ``influxdb``. diff --git a/doc/source/reference/rating/cloudkitty-guide.rst b/doc/source/reference/rating/cloudkitty-guide.rst index 061e09675..dbe88b9c7 100644 --- a/doc/source/reference/rating/cloudkitty-guide.rst +++ b/doc/source/reference/rating/cloudkitty-guide.rst @@ -60,7 +60,7 @@ Cloudkitty Storage Backend ~~~~~~~~~~~~~~~~~~~~~~~~~~ As for collectors, CloudKitty supports multiple backend to store ratings. -By default, Kolla Ansible uses the InfluxDB based backend. +By default, Kolla Ansible uses the SQLAlchemy based backend. Another famous alternative is OpenSearch and can be activated in Kolla Ansible using the ``cloudkitty_storage_backend`` configuration option in diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 8c32f5b3f..063503bee 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -381,7 +381,6 @@ workaround_ansible_issue_8743: true #enable_horizon_trove: "{{ enable_trove | bool }}" #enable_horizon_watcher: "{{ enable_watcher | bool }}" #enable_horizon_zun: "{{ enable_zun | bool }}" -#enable_influxdb: "{{ enable_cloudkitty | bool and cloudkitty_storage_backend == 'influxdb' }}" #enable_ironic: false #enable_ironic_neutron_agent: false #enable_ironic_prometheus_exporter: "{{ enable_ironic | bool and enable_prometheus | bool }}" @@ -433,7 +432,6 @@ workaround_ansible_issue_8743: true #enable_valkey: false #enable_skyline: false #enable_tacker: false -#enable_telegraf: false #enable_trove: false #enable_trove_singletenant: false #enable_watcher: false @@ -585,12 +583,9 @@ workaround_ansible_issue_8743: true ####################### # Valid option is gnocchi #cloudkitty_collector_backend: "gnocchi" -# 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" +# Valid options is 'sqlalchemy'. The default value is +# 'sqlalchemy. +#cloudkitty_storage_backend: "sqlalchemy" ################### # Designate options @@ -761,13 +756,6 @@ workaround_ansible_issue_8743: true # - host1:port1 # - host2:port2 -########## -# Telegraf -########## -# Configure telegraf to use the docker daemon itself as an input for -# telemetry data. -#telegraf_enable_docker_input: false - ########################################## # Octavia - openstack loadbalancer Options ########################################## diff --git a/releasenotes/notes/drop-influxdb-telegraf-53da82866d55c3e5.yaml b/releasenotes/notes/drop-influxdb-telegraf-53da82866d55c3e5.yaml new file mode 100644 index 000000000..92deca5d7 --- /dev/null +++ b/releasenotes/notes/drop-influxdb-telegraf-53da82866d55c3e5.yaml @@ -0,0 +1,14 @@ +--- +upgrade: + - | + Support for deploying ``influxdb`` has been dropped, because Kolla + delivers a community end of life version v1, and there are no plans + to upgrade influxdb to v2 - there are better open source alternatives + out there. + Existing users need to remove influxdb containers and their + configuration manually. + - | + Support for deploying ``telegraf`` has been dropped after earlier + deprecation. + Existing users need to remove telegraf containers and their + configuration manually. diff --git a/tests/templates/inventory.j2 b/tests/templates/inventory.j2 index b5bb76907..0751557a3 100644 --- a/tests/templates/inventory.j2 +++ b/tests/templates/inventory.j2 @@ -97,10 +97,6 @@ monitoring [etcd:children] control -[influxdb] -# NOTE(dszumski): This doesn't support clustering -primary - [prometheus:children] monitoring diff --git a/tools/cleanup-host b/tools/cleanup-host index 52bfde386..a7d8ba340 100755 --- a/tools/cleanup-host +++ b/tools/cleanup-host @@ -52,11 +52,6 @@ if [[ "$gnocchi_metric_datadir_volume" != "gnocchi" && -d "$gnocchi_metric_datad rm -rfv $gnocchi_metric_datadir_volume fi -if [[ "$influxdb_datadir_volume" != "influxdb" && -d "$influxdb_datadir_volume" ]]; then - echo "Removing influxdb volume if it is customized" - rm -rfv $influxdb_datadir_volume -fi - if [[ "$opensearch_datadir_volume" != "opensearch" && -d "$opensearch_datadir_volume" ]]; then echo "Removing opensearch volume if it is customized" rm -rfv $opensearch_datadir_volume |