T7528: only stop service if previously deployed #4547

nvollmar · 2025-06-06T09:28:13Z

Change summary

Apply tries to stop services that weren't configured in the first place. Adding check to only try to stop services which were installed.

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Code style update (formatting, renaming)
Refactoring (no functional changes)
Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
Other (please describe):

Related Task(s)

https://vyos.dev/T7528

Related PR(s)

prometheus: T7435: Ensure only configured exporters are started #4498

How to test / Smoketest result

set interfaces dummy dum0 address '192.0.2.1/32'
set service monitoring prometheus node-exporter collectors textfile
set service monitoring prometheus node-exporter listen-address '192.0.2.1'

Verify logs not trying to stop in-existing vrr/blackbox exporter services

Checklist:

I have read the CONTRIBUTING document
I have linked this PR to one or more Phabricator Task(s)
I have run the components SMOKETESTS if applicable
My commit headlines contain a valid Task id
My change requires a change to the documentation
I have updated the documentation accordingly

github-actions · 2025-06-06T09:28:31Z

👍
No issues in PR Title / Commit Title

sever-sever

Works as expected

sever-sever

Smoketest fail:

 DEBUG - Running Testcase: /usr/libexec/vyos/tests/smoke/cli/test_service_monitoring_prometheus.py
DEBUG - test_01_node_exporter (__main__.TestMonitoringPrometheus.test_01_node_exporter) ... FAIL
DEBUG - test_02_frr_exporter (__main__.TestMonitoringPrometheus.test_02_frr_exporter) ... FAIL
DEBUG - test_03_blackbox_exporter (__main__.TestMonitoringPrometheus.test_03_blackbox_exporter) ... FAIL
DEBUG - test_04_blackbox_exporter_with_config (__main__.TestMonitoringPrometheus.test_04_blackbox_exporter_with_config) ... FAIL
DEBUG - 
DEBUG - ======================================================================
DEBUG - FAIL: test_01_node_exporter (__main__.TestMonitoringPrometheus.test_01_node_exporter)
DEBUG - ----------------------------------------------------------------------
DEBUG - Traceback (most recent call last):
DEBUG -   File "/usr/libexec/vyos/tests/smoke/cli/test_service_monitoring_prometheus.py", line 54, in tearDown
DEBUG -     self.assertFalse(process_named_running(NODE_EXPORTER_PROCESS_NAME))
DEBUG - AssertionError: 205301 is not false
DEBUG - 
DEBUG - ======================================================================
DEBUG - FAIL: test_02_frr_exporter (__main__.TestMonitoringPrometheus.test_02_frr_exporter)
DEBUG - ----------------------------------------------------------------------
DEBUG - Traceback (most recent call last):
DEBUG -   File "/usr/libexec/vyos/tests/smoke/cli/test_service_monitoring_prometheus.py", line 54, in tearDown
DEBUG -     self.assertFalse(process_named_running(NODE_EXPORTER_PROCESS_NAME))
DEBUG - AssertionError: 205301 is not false
DEBUG - 
DEBUG - ======================================================================
DEBUG - FAIL: test_03_blackbox_exporter (__main__.TestMonitoringPrometheus.test_03_blackbox_exporter)
DEBUG - ----------------------------------------------------------------------
DEBUG - Traceback (most recent call last):
DEBUG -   File "/usr/libexec/vyos/tests/smoke/cli/test_service_monitoring_prometheus.py", line 54, in tearDown
DEBUG -     self.assertFalse(process_named_running(NODE_EXPORTER_PROCESS_NAME))
DEBUG - AssertionError: 205301 is not false
DEBUG - 
DEBUG - ======================================================================
DEBUG - FAIL: test_04_blackbox_exporter_with_config (__main__.TestMonitoringPrometheus.test_04_blackbox_exporter_with_config)
DEBUG - ----------------------------------------------------------------------
DEBUG - Traceback (most recent call last):
DEBUG -   File "/usr/libexec/vyos/tests/smoke/cli/test_service_monitoring_prometheus.py", line 54, in tearDown
DEBUG -     self.assertFalse(process_named_running(NODE_EXPORTER_PROCESS_NAME))
DEBUG - AssertionError: 205301 is not false
DEBUG - 
DEBUG - ----------------------------------------------------------------------
DEBUG - Ran 4 tests in 17.966s
DEBUG - 
DEBUG - FAILED (failures=4)

github-actions · 2025-06-06T16:01:57Z

CI integration ❌ failed!

Details

CI logs

CLI Smoketests (no interfaces) ❌ failed
CLI Smoketests (interfaces only) 👍 passed
Config tests 👍 passed
RAID1 tests 👍 passed
TPM tests 👍 passed

nvollmar · 2025-06-08T13:57:35Z

DEBUG - Running Testcase: /usr/libexec/vyos/tests/smoke/cli/test_container.py
DEBUG - test_api_socket (__main__.TestContainer.test_api_socket) ... ok
DEBUG - test_basic (__main__.TestContainer.test_basic) ... ok
DEBUG - test_cpu_limit (__main__.TestContainer.test_cpu_limit) ... ok
DEBUG - test_dual_stack_network (__main__.TestContainer.test_dual_stack_network) ... ok
DEBUG - test_ipv4_network (__main__.TestContainer.test_ipv4_network) ... ok
DEBUG - test_ipv6_network (__main__.TestContainer.test_ipv6_network) ... ok
DEBUG - test_log_driver (__main__.TestContainer.test_log_driver) ... ok
DEBUG - test_name_server (__main__.TestContainer.test_name_server) ... ok
DEBUG - test_network_mtu (__main__.TestContainer.test_network_mtu) ... ok
DEBUG - test_no_name_server (__main__.TestContainer.test_no_name_server) ... ok
DEBUG - test_uid_gid (__main__.TestContainer.test_uid_gid) ... ok

sever-sever · 2025-06-09T11:11:01Z

Smoketest still fail

vyos@r14:~$ /usr/libexec/vyos/tests/smoke/cli/test_service_monitoring_prometheus.py
test_01_node_exporter (__main__.TestMonitoringPrometheus.test_01_node_exporter) ... ERROR
test_02_frr_exporter (__main__.TestMonitoringPrometheus.test_02_frr_exporter) ... ERROR
test_03_blackbox_exporter (__main__.TestMonitoringPrometheus.test_03_blackbox_exporter) ... ERROR
test_04_blackbox_exporter_with_config (__main__.TestMonitoringPrometheus.test_04_blackbox_exporter_with_config) ... ERROR
tearDownClass (__main__.TestMonitoringPrometheus) ... ERROR

======================================================================
ERROR: test_01_node_exporter (__main__.TestMonitoringPrometheus.test_01_node_exporter)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/libexec/vyos/tests/smoke/cli/test_service_monitoring_prometheus.py", line 53, in tearDown
    self.cli_commit()
  File "/usr/libexec/vyos/tests/smoke/cli/base_vyostest_shim.py", line 103, in cli_commit
    out = self._session.commit()
          ^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3/dist-packages/vyos/configsession.py", line 300, in commit
    out = self.__run_command([COMMIT])
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3/dist-packages/vyos/configsession.py", line 230, in __run_command
    raise ConfigSessionError(output)
vyos.configsession.ConfigSessionError: [ service monitoring prometheus ]
Traceback (most recent call last):
  File "/usr/libexec/vyos/services/vyos-configd", line 145, in run_script
    script.generate(c)
  File "/usr/libexec/vyos//conf_mode/service_monitoring_prometheus.py", line 118, in generate
    monitoring.update({'node_exporter_stop_required': {}})
    ^^^^^^^^^^^^^^^^^
AttributeError: 'NoneType' object has no attribute 'update'

delete [ service monitoring prometheus ] failed
Commit failed


======================================================================
ERROR: test_02_frr_exporter (__main__.TestMonitoringPrometheus.test_02_frr_exporter)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/libexec/vyos/tests/smoke/cli/test_service_monitoring_prometheus.py", line 53, in tearDown
    self.cli_commit()
  File "/usr/libexec/vyos/tests/smoke/cli/base_vyostest_shim.py", line 103, in cli_commit
    out = self._session.commit()
          ^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3/dist-packages/vyos/configsession.py", line 300, in commit
    out = self.__run_command([COMMIT])
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3/dist-packages/vyos/configsession.py", line 230, in __run_command
    raise ConfigSessionError(output)
vyos.configsession.ConfigSessionError: [ service monitoring prometheus ]
Traceback (most recent call last):
  File "/usr/libexec/vyos/services/vyos-configd", line 145, in run_script
    script.generate(c)
  File "/usr/libexec/vyos//conf_mode/service_monitoring_prometheus.py", line 124, in generate
    monitoring.update({'frr_exporter_stop_required': {}})
    ^^^^^^^^^^^^^^^^^
AttributeError: 'NoneType' object has no attribute 'update'

delete [ service monitoring prometheus ] failed
Commit failed


======================================================================
ERROR: test_03_blackbox_exporter (__main__.TestMonitoringPrometheus.test_03_blackbox_exporter)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/libexec/vyos/tests/smoke/cli/test_service_monitoring_prometheus.py", line 53, in tearDown
    self.cli_commit()
  File "/usr/libexec/vyos/tests/smoke/cli/base_vyostest_shim.py", line 103, in cli_commit
    out = self._session.commit()
          ^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3/dist-packages/vyos/configsession.py", line 300, in commit
    out = self.__run_command([COMMIT])
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3/dist-packages/vyos/configsession.py", line 230, in __run_command
    raise ConfigSessionError(output)
vyos.configsession.ConfigSessionError: [ service monitoring prometheus ]
Traceback (most recent call last):
  File "/usr/libexec/vyos/services/vyos-configd", line 145, in run_script
    script.generate(c)
  File "/usr/libexec/vyos//conf_mode/service_monitoring_prometheus.py", line 130, in generate
    monitoring.update({'blackbox_exporter_stop_required': {}})
    ^^^^^^^^^^^^^^^^^
AttributeError: 'NoneType' object has no attribute 'update'

delete [ service monitoring prometheus ] failed
Commit failed


======================================================================
ERROR: test_04_blackbox_exporter_with_config (__main__.TestMonitoringPrometheus.test_04_blackbox_exporter_with_config)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/libexec/vyos/tests/smoke/cli/test_service_monitoring_prometheus.py", line 53, in tearDown
    self.cli_commit()
  File "/usr/libexec/vyos/tests/smoke/cli/base_vyostest_shim.py", line 103, in cli_commit
    out = self._session.commit()
          ^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3/dist-packages/vyos/configsession.py", line 300, in commit
    out = self.__run_command([COMMIT])
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3/dist-packages/vyos/configsession.py", line 230, in __run_command
    raise ConfigSessionError(output)
vyos.configsession.ConfigSessionError: [ service monitoring prometheus ]
Traceback (most recent call last):
  File "/usr/libexec/vyos/services/vyos-configd", line 145, in run_script
    script.generate(c)
  File "/usr/libexec/vyos//conf_mode/service_monitoring_prometheus.py", line 130, in generate
    monitoring.update({'blackbox_exporter_stop_required': {}})
    ^^^^^^^^^^^^^^^^^
AttributeError: 'NoneType' object has no attribute 'update'

delete [ service monitoring prometheus ] failed
Commit failed


======================================================================
ERROR: tearDownClass (__main__.TestMonitoringPrometheus)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/libexec/vyos/tests/smoke/cli/base_vyostest_shim.py", line 73, in tearDownClass
    cls._session.commit()
  File "/usr/lib/python3/dist-packages/vyos/configsession.py", line 300, in commit
    out = self.__run_command([COMMIT])
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3/dist-packages/vyos/configsession.py", line 230, in __run_command
    raise ConfigSessionError(output)
vyos.configsession.ConfigSessionError: [ service monitoring prometheus ]
Traceback (most recent call last):
  File "/usr/libexec/vyos/services/vyos-configd", line 146, in run_script
    script.apply(c)
  File "/usr/libexec/vyos//conf_mode/service_monitoring_prometheus.py", line 179, in apply
    if 'node_exporter_stop_required' in monitoring:
       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
TypeError: argument of type 'NoneType' is not iterable

delete [ service monitoring prometheus ] failed
[[]] failed
Commit failed


During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/usr/libexec/vyos/tests/smoke/cli/test_service_monitoring_prometheus.py", line 49, in tearDownClass
    super(TestMonitoringPrometheus, cls).tearDownClass()
  File "/usr/libexec/vyos/tests/smoke/cli/base_vyostest_shim.py", line 76, in tearDownClass
    cls.fail(cls)
  File "/usr/lib/python3.11/unittest/case.py", line 703, in fail
    raise self.failureException(msg)
AssertionError: None

----------------------------------------------------------------------
Ran 4 tests in 19.943s

FAILED (errors=5)
vyos@r14:~$

sever-sever · 2025-06-09T11:17:01Z

src/conf_mode/service_monitoring_prometheus.py

@@ -115,16 +115,19 @@ def generate(monitoring):
        # Delete systemd files
        if os.path.isfile(node_exporter_service_file):
            os.unlink(node_exporter_service_file)
+            monitoring.update({'node_exporter_stop_required': {}})


The update dictionary should be in the get_config

github-actions bot added the current label Jun 6, 2025

github-actions bot assigned nvollmar Jun 6, 2025

sever-sever approved these changes Jun 6, 2025

View reviewed changes

sever-sever requested a review from c-po June 6, 2025 09:33

sever-sever added the bp/circinus Create automatic backport for circinus label Jun 6, 2025

sever-sever requested changes Jun 6, 2025

View reviewed changes

T7528: only stop service if previously deployed

1c61ecd

nvollmar force-pushed the T7528 branch from 5b425f4 to 1c61ecd Compare June 6, 2025 14:02

sever-sever reviewed Jun 9, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

T7528: only stop service if previously deployed #4547

T7528: only stop service if previously deployed #4547

Uh oh!

nvollmar commented Jun 6, 2025

Uh oh!

github-actions bot commented Jun 6, 2025 •

edited

Loading

Uh oh!

sever-sever left a comment

Uh oh!

sever-sever left a comment

Uh oh!

github-actions bot commented Jun 6, 2025

Uh oh!

nvollmar commented Jun 8, 2025

Uh oh!

sever-sever commented Jun 9, 2025

Uh oh!

sever-sever Jun 9, 2025

Uh oh!

Uh oh!

T7528: only stop service if previously deployed #4547

Are you sure you want to change the base?

T7528: only stop service if previously deployed #4547

Uh oh!

Conversation

nvollmar commented Jun 6, 2025

Change summary

Types of changes

Related Task(s)

Related PR(s)

How to test / Smoketest result

Checklist:

Uh oh!

github-actions bot commented Jun 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sever-sever left a comment

Choose a reason for hiding this comment

Uh oh!

sever-sever left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jun 6, 2025

Details

Uh oh!

nvollmar commented Jun 8, 2025

Uh oh!

sever-sever commented Jun 9, 2025

Uh oh!

sever-sever Jun 9, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Jun 6, 2025 •

edited

Loading