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

Consolidate IRIS and stackhpc branches #80

Open
wants to merge 5 commits into
base: stackhpc/victoria
Choose a base branch
from
Open

Consolidate IRIS and stackhpc branches #80

wants to merge 5 commits into from

Commits on May 14, 2021

  1. Add Prometheus libvirt exporter image 

    This adds a libvirt exporter image for use with Prometheus.

Partially-Implements: blueprint libvirt-exporter
Change-Id: Ice2af99a323496d3821762851b663899d15f569a
(cherry picked from commit f08bad6)
(cherry picked from commit 92f0264ba60b26384bf16b890a20cbda0b3d9564)
(cherry picked from commit d9f48d8)
    @dougszumski @jovial
    dougszumski authored and jovial committed May 14, 2021
    Configuration menu
    Copy the full SHA
    c95253e View commit details
    Browse the repository at this point in the history

  2. Add Prometheus Jiralert container 

    This uses the binary release from github.

(cherry picked from commit 59200c6)
(cherry picked from commit af06548480682f032d84924c6e6e07e93a59d40c)
(cherry picked from commit 909ad12)
    @dougszumski @jovial
    dougszumski authored and jovial committed May 14, 2021
    Configuration menu
    Copy the full SHA
    5e912d4 View commit details
    Browse the repository at this point in the history

  3. Add cASO Docker image 

    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)
    @dougszumski @jovial
    dougszumski authored and jovial committed May 14, 2021
    Configuration menu
    Copy the full SHA
    d084109 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2021

  1. Merge remote-tracking branch 'upstream/stable/victoria' into HEAD 

    Conflicts:
	kolla/template/repos.yaml
    @jovial
    jovial committed May 19, 2021
    Configuration menu
    Copy the full SHA
    d4a569f View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2021

  1. Merge remote-tracking branch 'rse/cumulus/victoria' into HEAD 

    Conflict notes:

- Removed the blank line under debian dictionary for consistency
  with the others.

Conflicts:
	kolla/template/repos.yaml

Change-Id: I68b210dc41e25f2c6d53a43ff3f740abec64d9fa
    @jovial
    jovial committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    d6a5990 View commit details
    Browse the repository at this point in the history