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.

Sign up for GitHub

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

Jump to bottom

Apply Xena backports from Wallaby #143

Merged
merged 5 commits into from
Jun 20, 2022
Merged

Apply Xena backports from Wallaby #143

merged 5 commits into from
Jun 20, 2022

Conversation

markgoddard
Copy link

Applied the uncommented commits:

8a7b07c96 prometheus-libvirt-exporter: fix build with newer Go
2d4f808c6 Add cASO Docker image
# 5e31a46ca Add Prometheus libvirt exporter image
1f737a1f2 Build openstack-exporter fork from source
a629c55f6 Build jiralert from stackhpc fork
d860b27b3 Add prometheus-msteams image
49dd6d3cd Add Prometheus Jiralert container
# 88bfd6804 ceph: Update CentOS packages to Pacific
# 1a14f9b81 Bump up cAdvisor's version

dougszumski and others added 5 commits June 17, 2022 16:28
@dougszumski @markgoddard
Add Prometheus Jiralert container
4ffed74 
This uses the binary release from GitHub.

Change-Id: Id7df96e7d5b646d4b42e06945bafdbce828b902b
Co-Authored-By: Pierre Riteau <[email protected]>
(cherry picked from commit 034419e)
(cherry picked from commit 49dd6d3)
@priteau @markgoddard
Add prometheus-msteams image
b9beaf0 
This can be used to forward Prometheus Alertmanager notifications to
Microsoft Teams.

Change-Id: I57ebdf734c4bf38045ca8f837dc7066cdeb16131
(cherry picked from commit a7e3c80)
@priteau @markgoddard
Build jiralert from stackhpc fork
d2c73c7 
Change-Id: I2a28befb6c4e3baf30e9929ae7ea224945ec7210
(cherry picked from commit a13b42f)
(cherry picked from commit a629c55)
@priteau @markgoddard
Build openstack-exporter fork from source
04c1e03 
(cherry picked from commit 1034a61)
(cherry picked from commit 1f737a1)
@dougszumski @markgoddard
Add cASO Docker image
7da8965 
cASO is an OpenStack accounting exporter. For more detail see:
https://github.com/IFCA/caso

Conflicts:
	kolla/common/config.py

(cherry picked from commit e4c1466)
(cherry picked from commit 838078d97bc2399f6e4e5288cfc39b179e6da6d6)
(cherry picked from commit b0e0d4b)

Change-Id: Ifeda576a2b18d31ebbf502fb7a655522f3693f1e
(cherry picked from commit 2d4f808)
@markgoddard markgoddard requested a review from a team as a code owner June 17, 2022 15:45
priteau
priteau approved these changes Jun 17, 2022
View reviewed changes
Copy link
Member

@priteau priteau left a comment

Choose a reason for hiding this comment

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

We may want to eventually replace the custom openstack-exporter by a backport of the update to 1.6.0 I proposed upstream.

@markgoddard markgoddard merged commit b4c75c4 into stackhpc/xena Jun 20, 2022
@markgoddard markgoddard deleted the xena-backports branch June 20, 2022 12:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@priteau priteau priteau approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@markgoddard @priteau @dougszumski