15 Commits

Author SHA1 Message Date
Jaromir Wysoglad
3dcd00ad33 Sort column order in cli output
Change-Id: Ie2db01d02483cf6767d5d54159ebf203e20dd2c5
2024-04-10 02:13:13 -04:00
Jaromir Wysoglad
ed042e2b16 Fix table formatter
It's possible for Prometheus to return multiple metrics, where
each of them has different labels. Before this the client
would fail with error when using the default table formatter,
because of for example:

Row has incorrect number of values, (actual) 8!=9 (expected)

It was also possible to mismatch the label keys and values
for some of the rows.

This patch makes sure the label values are matched to the correct
keys. It also makes sure it uses all labels and it fills
missing values with empty strings for metrics, which don't have
that label defined.

Example table output:
+------------+----------+------------+----------------+-------+
| group      | __name__ | job        | instance       | value |
+------------+----------+------------+----------------+-------+
|            | up       | sg-core    | localhost:3000 | 1     |
| production | up       | prometheus | localhost:9090 | 1     |
+------------+----------+------------+----------------+-------+

Example json output:
[
  {
    "__name__": "up",
    "group": "",
    "job": "sg-core",
    "instance": "localhost:3000",
    "value": "1"
  },
  {
    "__name__": "up",
    "group": "production",
    "job": "prometheus",
    "instance": "localhost:9090",
    "value": "1"
  }
]

Change-Id: Id0dfabf52fe0a21194c498f4aefa1bff1d3eeea9
2024-03-21 05:05:48 -04:00
Jaromir Wysoglad
6047081ec1 Add TLS support.
This adds a new config option: "prometheus_ca_cert". If this
option is set, then it forces the client to use https to access
prometheus and it uses the specified ca cert to verify the
prometheus' certificate.

Change-Id: Iccb911a590d5b3b9a4c6ac08c4d020641c8094a9
2024-02-26 08:17:08 -05:00
Jaromir Wysoglad
e8961fdf62 Add functional tests
This adds new functional tests, which are supposed to be run
on devstack with a running instance of prometheus.
It tests all of the cli commands as well as all the functions
exposed in the python client.

These tests could be included into the telemetry-dsvm-integration
jobs in the future to use the same devstack vm.

Change-Id: Ibd6deec559465bf3cb7480681b816f55bdf9010e
2023-11-15 05:54:41 -05:00
Jaromir Wysoglad
75fcc4b4e9 Fix cli commands
Something must have changed either with cliff or
with a different version of python. All of the
cli commands end with: "'Namespace' object is not subscriptable"
This is caused because of how the parsed_args fields
were accessed.

This patch addresses the issue. Now it accesses the fields
the same way as aodhclient does. The unit tests for cli
now use the arg parser to actually test this.

During this I also discovered incorrect mocking in the
configuration tests. I added another mock to the test cases
which were missing it.

Change-Id: Ib5dbbdb48bdfd3214ec76acc4c68649e25f695db
2023-11-14 09:33:14 +00:00
Jaromir Wysoglad
d0b868db94 Add i18n.py and use it in v1/base.py and v1/cli.py
This follow similar pattern as other repositories like ceilometer.

Change-Id: Id9abda5720bd93d7fe68ee10deb124bdb665a430
2023-11-08 02:28:00 -05:00
Erno Kuvaja
5746f69ddc Flake8 changes
Adding comments for all ignores and extensions.
Adding extensions from OpenStack Hacking.
Fixing few breakages of those added extensions.

Change-Id: Idacee2ca555411e33b65817fb9245d130cf36574
2023-10-18 12:23:49 +01:00
Jaromir Wysoglad
26687730b3 Fix zuul testing
This change fixes python 3.8 unit tests.
Unfortunately using grouping parentheses in with statements
is a python 3.9+ feature. I had to replace the parentheses
with a less elegant "\" to escape continuation lines.

I also included a .zuul.yaml, without which this couldn't
get merged and a .gitreview for convinience.

The telemetry-dsvm-* tests are non-voting for now.
There isn't any relevant test for this repositary
there as of right now,
those will get added in the next few weeks. And
unfortunately all the telemetry-dsvm-* tests fail
due to pyparsing version mismatch right now.
Once I or anyone else adds relevant tests to the
telemetry tempest plugin, we can make the tests
voting here.

Co-authored-by: Martin Magr <mmagr@redhat.com>
Co-authored-by: Erno Kuvaja <jokke@usr.fi>
Change-Id: Icc7b0229bca0664ee7fd60e3932df8f599beb500
2023-10-16 09:02:34 -04:00
Jaromír Wysoglad
53b335aaca
Add automated unit testing and a set of tests (#9)
* Add unit testing

* Fix code according to CI

This includes:
  - formating changes
  - rewording of some doc strings
  - adding support to {label!~'value'} in rbac

* Add unit tests automation

* Fix CI automation

* Add requirements.txt
2023-09-05 14:54:33 +02:00
Jaromír Wysoglad
a580772449
Prometheus interaction (#7)
* Remove old observability client

* Add initial functionality for prometheus querying

* Fix a copy-paste error in get_client()

* Add additional functionality.

This commit adds:
    - commands:
        delete
        clear-tombstones
        snapshot
    - Better rbac injection as well as a possibility
      to disable rbac.
    - Configuration of prometheus_client through
      env variables and /etc/openstack/prometheus.yaml

* Make README up to date

* Implement Martin's PR comments

* Implement better support for label values in rbac

* PEP8
2023-08-03 15:30:19 +02:00
Chris Sibbitt
a5b8fb7680
Fixed missing comma 2022-12-01 13:35:54 -05:00
Martin Mágr
cb7cfe2f54 Missing piece 2022-11-01 16:43:39 +01:00
Martin Mágr
82cb579cc6 Allow inventory overrides
For deploy.discovery command:
  This patch allows inventory file destination fallback override and adds
  additional fallback paths used by standalone deployment.

For deploy.setup command:
  This patch allows to override usage of generated inventory file.
2022-11-01 16:37:57 +01:00
Martin Mágr
5f523534fa
Initial functionality (#1)
This patch adds basic functionality of the plugin. It successfully registers as openstackclient plugin and contains two basic observability commands:

   - discover
      - prepares ansible inventory file with overcloud and undercloud nodes and gather data for prometheus agent according to which nodes are scrapable
   - setup
      - starts proper ansible playbook based on component (currently only prometheus_agent is available)

Co-authored-by: Marihan Girgis mgirgisf@redhat.com
Partially-Implements: OSP-14664
Related: infrawatch/osp-observability-ansible#11
2022-10-26 17:00:11 +02:00
Martin Mágr
7ad72695a3 Initial commit 2022-04-25 13:02:34 +02:00