Merge "Add sg-core integration test"

This commit is contained in:
Zuul 2023-11-21 04:53:22 +00:00 committed by Gerrit Code Review
commit 8271356a67
4 changed files with 19 additions and 1 deletions

View File

@ -78,6 +78,7 @@
- openstack/diskimage-builder - openstack/diskimage-builder
- openstack/tempest - openstack/tempest
- gnocchixyz/gnocchi - gnocchixyz/gnocchi
- infrawatch/sg-core
vars: &base_vars vars: &base_vars
configure_swap_size: 8192 configure_swap_size: 8192
devstack_plugins: devstack_plugins:
@ -85,13 +86,14 @@
ceilometer: https://opendev.org/openstack/ceilometer ceilometer: https://opendev.org/openstack/ceilometer
aodh: https://opendev.org/openstack/aodh aodh: https://opendev.org/openstack/aodh
panko: https://opendev.org/openstack/panko panko: https://opendev.org/openstack/panko
sg-core: https://github.com/infrawatch/sg-core
devstack_services: devstack_services:
tempest: true tempest: true
devstack_localrc: devstack_localrc:
USE_PYTHON3: True USE_PYTHON3: True
TEMPEST_PLUGINS: '"/opt/stack/telemetry-tempest-plugin /opt/stack/heat-tempest-plugin"' TEMPEST_PLUGINS: '"/opt/stack/telemetry-tempest-plugin /opt/stack/heat-tempest-plugin"'
GNOCCHI_ARCHIVE_POLICY_TEMPEST: "ceilometer-high-rate" GNOCCHI_ARCHIVE_POLICY_TEMPEST: "ceilometer-high-rate"
CEILOMETER_BACKEND: "gnocchi" CEILOMETER_BACKENDS: "gnocchi,sg-core"
CEILOMETER_PIPELINE_INTERVAL: 15 CEILOMETER_PIPELINE_INTERVAL: 15
CEILOMETER_ALARM_THRESHOLD: 6000000000 CEILOMETER_ALARM_THRESHOLD: 6000000000
GLOBAL_VENV: False GLOBAL_VENV: False

View File

@ -70,6 +70,10 @@ TelemetryGroup = [
default=False, default=False,
help="Disable SSL certificate validation when running " help="Disable SSL certificate validation when running "
"scenario tests"), "scenario tests"),
cfg.StrOpt('sg_core_service_url',
default="127.0.0.1:3000",
help="URL to sg-core prometheus endpoint"),
] ]
event_opts = [ event_opts = [

View File

@ -0,0 +1,10 @@
tests:
- name: Check for ceilometer metrics
desc: Check the sg-core prometheus endpoint for ceilometer metrics
GET: $ENVIRON['SG_CORE_SERVICE_URL']/metrics
poll:
count: 60
delay: 2
response_strings:
- "ceilometer_image_size"
- "sg_total_ceilometer_metric_decode_error_count{source=\"SG\"} 0"

View File

@ -94,6 +94,8 @@ class TestTelemetryIntegration(manager.ScenarioTest):
"HEAT_SERVICE_URL": self._get_endpoint(auth, "heat_plugin"), "HEAT_SERVICE_URL": self._get_endpoint(auth, "heat_plugin"),
"NOVA_SERVICE_URL": self._get_endpoint(auth, "compute"), "NOVA_SERVICE_URL": self._get_endpoint(auth, "compute"),
"GLANCE_SERVICE_URL": self._get_endpoint(auth, "image"), "GLANCE_SERVICE_URL": self._get_endpoint(auth, "image"),
"SG_CORE_SERVICE_URL":
str(config.CONF.telemetry.sg_core_service_url),
"GLANCE_IMAGE_NAME": self.image_create(), "GLANCE_IMAGE_NAME": self.image_create(),
"NOVA_FLAVOR_REF": config.CONF.compute.flavor_ref, "NOVA_FLAVOR_REF": config.CONF.compute.flavor_ref,
"NEUTRON_NETWORK": networks[0].get('id'), "NEUTRON_NETWORK": networks[0].get('id'),