Skip to content
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

[DPE-2935] Integrating Prometheus Exporter #145

Merged
merged 15 commits into from
Dec 6, 2023

Conversation

juditnovak
Copy link
Contributor

@juditnovak juditnovak commented Nov 24, 2023

No description provided.

@juditnovak juditnovak force-pushed the DPE-2935_intrgrating_prometheus_exporter branch from b24661b to 3f9254e Compare November 28, 2023 10:36
@juditnovak juditnovak changed the base branch from DPE-3019-add-url-plugin-and-prometheus to main November 28, 2023 10:39
@juditnovak juditnovak force-pushed the DPE-2935_intrgrating_prometheus_exporter branch from 0e6819c to df7afa0 Compare November 28, 2023 10:58
@juditnovak juditnovak changed the title [DPE-2935] Intrgrating Prometheus Exporter [DPE-2935] Integrating Prometheus Exporter Nov 28, 2023
@juditnovak juditnovak force-pushed the DPE-2935_intrgrating_prometheus_exporter branch 4 times, most recently from 3362bd7 to b90884a Compare November 28, 2023 22:47
@juditnovak juditnovak marked this pull request as ready for review November 28, 2023 23:39
@juditnovak juditnovak force-pushed the DPE-2935_intrgrating_prometheus_exporter branch 5 times, most recently from 46e2ca2 to f05e7a7 Compare November 29, 2023 22:37
@phvalguima
Copy link
Contributor

phvalguima commented Dec 1, 2023

Hi @juditnovak, I have found a way to manage the removal of a given plugin, without neither removing the method _remove_plugin_if_needed from the run() method in plugin_manager, nor having to extend RelationBrokenEvent into plugin_manager.

What happens now is that we defer the relation-broken event until there is no more relations between opensearch and grafana-agent. I see that as a valid solution for the relation-broken issue.

@juditnovak
Copy link
Contributor Author

@phvalguima Sure, changes from your diff applied as a separate commit

@juditnovak juditnovak force-pushed the DPE-2935_intrgrating_prometheus_exporter branch 3 times, most recently from 41ad4d0 to 4f04de2 Compare December 3, 2023 16:00
phvalguima and others added 5 commits December 3, 2023 17:05
* Charm config
* OpenSearch version

With these options, it is possible to have an external URL passed as configuration parameter to the charm. The plugin class loads that config, resolves the version and returns a custom install_path.

Original functionality persists: if the charm does not implement new install_path property, then it returns plugin name.
@juditnovak juditnovak force-pushed the DPE-2935_intrgrating_prometheus_exporter branch 6 times, most recently from 04928a5 to df083e9 Compare December 4, 2023 11:18
lib/charms/opensearch/v0/opensearch_plugins.py Outdated Show resolved Hide resolved
lib/charms/opensearch/v0/opensearch_cos.py Outdated Show resolved Hide resolved
@juditnovak juditnovak force-pushed the DPE-2935_intrgrating_prometheus_exporter branch 2 times, most recently from be76844 to 2ed9511 Compare December 4, 2023 19:53
@juditnovak juditnovak force-pushed the DPE-2935_intrgrating_prometheus_exporter branch from 2ed9511 to 16ee479 Compare December 4, 2023 22:32
Copy link
Contributor

@phvalguima phvalguima left a comment

Choose a reason for hiding this comment

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

LGTM

@juditnovak juditnovak merged commit 550b205 into main Dec 6, 2023
17 checks passed
@juditnovak juditnovak deleted the DPE-2935_intrgrating_prometheus_exporter branch December 6, 2023 07:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants