Skip to content

Add reminder to remove custom blackbox endpoints #1515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: stackhpc/master
Choose a base branch
from

Conversation

technowhizz
Copy link
Contributor

No description provided.

@technowhizz technowhizz self-assigned this Feb 14, 2025
@technowhizz technowhizz requested a review from a team as a code owner February 14, 2025 23:36
@product-auto-label product-auto-label bot added size: s documentation Improvements or additions to documentation labels Feb 14, 2025
@technowhizz technowhizz force-pushed the upgrading-docs-blackbox branch 3 times, most recently from 76a896f to 800dfe6 Compare February 14, 2025 23:40
Copy link
Member

@Alex-Welsh Alex-Welsh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is coming in Epoxy, not Caracal, and I don't think we need the warning anyway. prometheus_blackbox_exporter_endpoints has been removed from the master branch already, so when we merge stackhpc/2025.1 to do the upgrades, it'll get removed automatically

@jackhodgkiss
Copy link
Contributor

This change is coming in Epoxy, not Caracal, and I don't think we need the warning anyway. prometheus_blackbox_exporter_endpoints has been removed from the master branch already, so when we merge stackhpc/2025.1 to do the upgrades, it'll get removed automatically

Though it won't be removed from a kolla/globals.yml inside an environment.

@Alex-Welsh
Copy link
Member

@technowhizz can you update this to target stackhpc/master and mention kolla/globals.yml inside an environment specifically?

@technowhizz technowhizz force-pushed the upgrading-docs-blackbox branch from 800dfe6 to 5a3e0b5 Compare March 27, 2025 09:47
@technowhizz technowhizz changed the base branch from stackhpc/2024.1 to stackhpc/master March 27, 2025 09:47
@technowhizz technowhizz requested a review from Alex-Welsh March 27, 2025 09:48
Comment on lines +88 to +118
Endpoints for the blackbox exporter are now templated in the kolla-ansible
group vars for the cloud. This means that the
``prometheus_blackbox_exporter_endpoints`` variable can be removed from the
environment's ``kolla/globals.yml`` file (if applicable) and the endpoints will
fallback to the ones templated in the group vars. Additional endpoints may be
added through the ``prometheus_blackbox_exporter_endpoints_kayobe`` variable.
For example:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Endpoints for the blackbox exporter are now templated in the kolla-ansible
group vars for the cloud.

Not all endpoints are templated e.g. backend endpoints. They're still done here in SKC.

Additional endpoints may be
added through the prometheus_blackbox_exporter_endpoints_kayobe variable.

That varies depending on what you want to template. This is all correct if you want it to be templated by kayobe, but you can also use stackhpc_prometheus_blackbox_exporter_endpoints_custom if you want it templated by Kolla Ansible

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you have examples of these @Alex-Welsh ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, so these endpoints are the ones that aren't templated in Kolla-Ansible upstream yet: https://github.com/stackhpc/stackhpc-kayobe-config/blob/stackhpc/master/etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter#L27-L66

And for the other one, there are two options if you want to add endpoints:
If you want kolla-ansible to template it then you add it to stackhpc_prometheus_blackbox_exporter_endpoints_custom
If you want kayobe to template it then you add it to prometheus_blackbox_exporter_endpoints_kayobe
The output can be different because they each access different variables.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Endpoints for the blackbox exporter are now templated in the kolla-ansible
group vars for the cloud. This means that the
``prometheus_blackbox_exporter_endpoints`` variable can be removed from the
environment's ``kolla/globals.yml`` file (if applicable) and the endpoints will
fallback to the ones templated in the group vars. Additional endpoints may be
added through the ``prometheus_blackbox_exporter_endpoints_kayobe`` variable.
For example:
Many endpoints for the Blackbox exporter are now templated in the Kolla-Ansible
group vars for the cloud. This means that the
``prometheus_blackbox_exporter_endpoints`` variable can be removed from the
environment's ``kolla/globals.yml`` file (if applicable) and the endpoints will
fallback to the ones templated in the group vars. Backend endpoints such as
`these <https://github.com/stackhpc/stackhpc-kayobe-config/blob/094c2e012a037309d103c08a71eb633fdeb214e7/etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter#L27-L64>`__
are not yet templated by Kolla-Ansible.
Additional endpoints may still be added.
For Kolla-Ansible templating, use ``stackhpc_prometheus_blackbox_exporter_endpoints_custom``.
For example:
.. code-block:: yaml
:caption: ``etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter``
stackhpc_prometheus_blackbox_exporter_endpoints_custom:
- 'custom_service:http_2xx:{{ public_protocol }}://{{ external_fqdn | put_address_in_context('url') }}:{{ custom_serivce_port }}'
Alternatively, for Kayobe templating, use the ``prometheus_blackbox_exporter_endpoints_kayobe`` variable.
For example:

@Alex-Welsh
Copy link
Member

Alex-Welsh commented May 9, 2025

@technowhizz I'd like to get this wrapped up soon since the epoxy release isn't far away. Can you respond to the comments & resolve the merge conflict?

@technowhizz technowhizz force-pushed the upgrading-docs-blackbox branch from 5a3e0b5 to 0e12723 Compare May 13, 2025 15:32
@technowhizz technowhizz changed the base branch from stackhpc/master to stackhpc/2024.1 May 13, 2025 15:32
@technowhizz technowhizz changed the base branch from stackhpc/2024.1 to stackhpc/master May 13, 2025 15:33
@technowhizz technowhizz force-pushed the upgrading-docs-blackbox branch from 0e12723 to 791410e Compare May 13, 2025 15:35
@Alex-Welsh
Copy link
Member

@technowhizz I've added a suggestion, could you review please?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation size: s
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants