Switch telemetry to using gnocchi archive policies
As example of Gnocchi archive policy usage default policy was created
and used for all metrics aggregation. The default policy is a copy
of Gnocchi medium policy, it can be used for testing Gnocchi policy
creation.
Also haproxy and nginx configuration is removed for ceilometer, because
ceilometer api is deprecated in Pike.
Change-Id: Iee942bc17195277e602c27c6e1d9ee739db975a9
Related-Prod: https://mirantis.jira.com/browse/PROD-21282
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env
index cf4c91c..06e16c6 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd dogtag barbican logrotate auditd)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd dogtag barbican logrotate auditd gnocchi)
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
index 63377bb..a6a5d2d 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
@@ -27,6 +27,8 @@
- system.keystone.client.service.panko
- system.keystone.client.service.gnocchi
- system.keystone.client.service.barbican
+- system.gnocchi.client
+- system.gnocchi.client.v1.archive_policy.default
- system.reclass.storage.system.openstack_dns_cluster
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.openstack_compute_multi
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
index 95ecbd3..a6d7720 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
@@ -9,7 +9,7 @@
- system.nova.compute.cluster
- system.neutron.compute.cluster
- system.ceilometer.client.nova_compute
-- system.ceilometer.agent.cluster
+- system.ceilometer.agent.telemetry.cluster
- system.ceilometer.agent.polling.default
- system.linux.network.interface.single_ovs_dvr
- system.nova.compute.libvirt.ssl
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml
index d8e1004..090d2d1 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml
@@ -14,17 +14,16 @@
- service.redis.server.single
- system.nginx.server.single
- system.nginx.server.proxy.openstack.aodh
-- system.nginx.server.proxy.openstack.ceilometer
- system.gnocchi.server.cluster
- system.gnocchi.common.storage.incoming.redis
- system.gnocchi.common.storage.file
- system.gnocchi.common.coordination.redis
-- system.ceilometer.server.cluster
+- system.ceilometer.server.telemetry.cluster
- system.ceilometer.server.coordination.redis
- system.aodh.server.cluster
- system.aodh.server.coordination.redis
- system.panko.server.cluster
-- system.ceilometer.server.backend.default
+- system.ceilometer.server.backend.gnocchi
- cluster.virtual-mcp-pike-dvr-ssl-barbican
parameters:
_param:
@@ -36,7 +35,6 @@
cluster_local_address: ${_param:single_address}
nginx_proxy_openstack_api_host: ${_param:openstack_telemetry_address}
nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
- nginx_proxy_openstack_ceilometer_host: 127.0.0.1
nginx_proxy_openstack_aodh_host: 127.0.0.1
nginx_proxy_ssl:
enabled: true
@@ -166,8 +164,6 @@
listen:
panko_api:
type: ~
- ceilometer_api:
- type: ~
gnocchi_api:
type: ~
aodh-api:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/.env b/classes/cluster/virtual-mcp-pike-dvr-ssl/.env
index ebce5d7..d593f62 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/.env
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd logrotate auditd)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd logrotate auditd gnocchi)
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
index 985f198..34fd9b2 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
@@ -24,6 +24,8 @@
- system.keystone.client.service.ceilometer
- system.keystone.client.service.panko
- system.keystone.client.service.gnocchi
+- system.gnocchi.client
+- system.gnocchi.client.v1.archive_policy.default
- system.reclass.storage.system.openstack_dns_cluster
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.openstack_compute_multi
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
index a1a1418..13b3a19 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
@@ -9,7 +9,7 @@
- system.nova.compute.cluster
- system.neutron.compute.cluster
- system.ceilometer.client.nova_compute
-- system.ceilometer.agent.cluster
+- system.ceilometer.agent.telemetry.cluster
- system.ceilometer.agent.polling.default
- system.linux.network.interface.single_ovs_dvr
- system.nova.compute.libvirt.ssl
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
index 58e8dfa..6279073 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
@@ -14,17 +14,16 @@
- service.redis.server.single
- system.nginx.server.single
- system.nginx.server.proxy.openstack.aodh
-- system.nginx.server.proxy.openstack.ceilometer
- system.gnocchi.server.cluster
- system.gnocchi.common.storage.incoming.redis
- system.gnocchi.common.storage.file
- system.gnocchi.common.coordination.redis
-- system.ceilometer.server.cluster
+- system.ceilometer.server.telemetry.cluster
- system.ceilometer.server.coordination.redis
- system.aodh.server.cluster
- system.aodh.server.coordination.redis
- system.panko.server.cluster
-- system.ceilometer.server.backend.default
+- system.ceilometer.server.backend.gnocchi
- cluster.virtual-mcp-pike-dvr-ssl
parameters:
_param:
@@ -36,7 +35,6 @@
cluster_local_address: ${_param:single_address}
nginx_proxy_openstack_api_host: ${_param:openstack_telemetry_address}
nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
- nginx_proxy_openstack_ceilometer_host: 127.0.0.1
nginx_proxy_openstack_aodh_host: 127.0.0.1
nginx_proxy_ssl:
enabled: true
@@ -166,8 +164,6 @@
listen:
panko_api:
type: ~
- ceilometer_api:
- type: ~
gnocchi_api:
type: ~
aodh-api:
diff --git a/classes/cluster/virtual-mcp-pike-dvr/.env b/classes/cluster/virtual-mcp-pike-dvr/.env
index 006f9e8..61c3d9e 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/.env
+++ b/classes/cluster/virtual-mcp-pike-dvr/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf backupninja logrotate auditd)
+FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf backupninja logrotate auditd gnocchi)
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
index 71c79a4..b400c32 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
@@ -25,6 +25,8 @@
- system.keystone.client.service.ceilometer
- system.keystone.client.service.panko
- system.keystone.client.service.gnocchi
+- system.gnocchi.client
+- system.gnocchi.client.v1.archive_policy.default
- system.reclass.storage.system.openstack_dns_cluster
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.openstack_compute_multi
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
index f9e3878..209fa2e 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
@@ -9,7 +9,7 @@
- system.cinder.volume.backend.lvm
- system.linux.storage.loopback
- system.ceilometer.client.nova_compute
-- system.ceilometer.agent.cluster
+- system.ceilometer.agent.telemetry.cluster
- system.ceilometer.agent.polling.default
- system.linux.network.interface.single_ovs_dvr
- cluster.virtual-mcp-pike-dvr
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml
index cf0be30..34090ce 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml
@@ -15,12 +15,12 @@
- system.gnocchi.common.storage.incoming.redis
- system.gnocchi.common.storage.file
- system.gnocchi.common.coordination.redis
-- system.ceilometer.server.cluster
+- system.ceilometer.server.telemetry.cluster
- system.ceilometer.server.coordination.redis
- system.aodh.server.cluster
- system.aodh.server.coordination.redis
- system.panko.server.cluster
-- system.ceilometer.server.backend.default
+- system.ceilometer.server.backend.gnocchi
- cluster.virtual-mcp-pike-dvr
parameters:
_param:
diff --git a/classes/cluster/virtual-mcp-pike-ovs/.env b/classes/cluster/virtual-mcp-pike-ovs/.env
index 006f9e8..61c3d9e 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/.env
+++ b/classes/cluster/virtual-mcp-pike-ovs/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf backupninja logrotate auditd)
+FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf backupninja logrotate auditd gnocchi)
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
index a4ddb38..3152758 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
@@ -25,6 +25,8 @@
- system.keystone.client.service.ceilometer
- system.keystone.client.service.panko
- system.keystone.client.service.gnocchi
+- system.gnocchi.client
+- system.gnocchi.client.v1.archive_policy.default
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.openstack_compute_multi
- system.reclass.storage.system.openstack_gateway_single
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
index e6d0e18..594b325 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
@@ -8,7 +8,7 @@
- system.cinder.volume.single
- system.cinder.volume.backend.lvm
- system.linux.storage.loopback
-- system.ceilometer.agent.cluster
+- system.ceilometer.agent.telemetry.cluster
- system.ceilometer.agent.polling.default
- cluster.virtual-mcp-pike-ovs
parameters:
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml
index dfd88af..5f6aa32 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml
@@ -15,12 +15,12 @@
- system.gnocchi.common.storage.incoming.redis
- system.gnocchi.common.storage.file
- system.gnocchi.common.coordination.redis
-- system.ceilometer.server.cluster
+- system.ceilometer.server.telemetry.cluster
- system.ceilometer.server.coordination.redis
- system.aodh.server.cluster
- system.aodh.server.coordination.redis
- system.panko.server.cluster
-- system.ceilometer.server.backend.default
+- system.ceilometer.server.backend.gnocchi
- cluster.virtual-mcp-pike-ovs
parameters:
_param: