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

Import master to stable-1.5 #120

Merged
merged 12 commits into from
Oct 26, 2023
Merged

Import master to stable-1.5 #120

merged 12 commits into from
Oct 26, 2023

Conversation

leifmadsen
Copy link
Member

Import master into stable-1.5 in preparation for STF 1.5.3 release.

vyzigold and others added 12 commits December 7, 2022 14:51
* Add TCP socket
* Add tcp and udp compatibility to ceil handler

Co-authored-by: Leif Madsen <lmadsen@redhat.com>
* Move to golang 1.19

* Found a bunch of 1.15 references in the CI machinery

* Upgrade json-iterator to 1.1.12

* Upgrade to golangci-lint 1.50

* Solve staticcheck lint

* gosec lint

* Remove deprecated linters to clear warnings

* Missing time import

* Warning from revive linter
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.11.0 to 1.11.1.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.11.0...v1.11.1)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fix integration CI

* Increase CI service creation timeout

* Use -buildvcs=false only for CI
* Add qdr log output to CI

Sometimes the CI fails with ceilometer timing out
when trying to send metrics. I hope that these logs
make it clearer what is happening.

* Split current metric CI, use bridge for ceilometer

* Bump CI ubuntu version

* Split ci/metrics to ceilometer and collectd

* Fix logging CI warning

* Add tcp transport CI job

* Rename files for TCP CI job

* Fix integration CI

* Decrease ceilometer pipeline interval

* Fix step description wording

Co-authored-by: Leif Madsen <lmadsen@redhat.com>

---------

Co-authored-by: Leif Madsen <lmadsen@redhat.com>
…#108)

Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.0.0-20210630005230-0f9fa26af87c to 0.1.0.
- [Release notes](https://github.com/golang/sys/releases)
- [Commits](https://github.com/golang/sys/commits/v0.1.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#116)

Bumps gopkg.in/yaml.v3 from 3.0.0-20210107192922-496545a6307b to 3.0.0.

---
updated-dependencies:
- dependency-name: gopkg.in/yaml.v3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Added a capability for generating ceilometer msgs

* Add app->collectd variable

---------

Co-authored-by: Leif Madsen <lmadsen@redhat.com>
* Make room for project/user names in metric messages

With changes [1] Ceilometer is now able to include "project_name"
and "user_name" fields into it's metrics. These fields are only
added when ceilometer has `tenant_name_discovery` config enabled.

This change amends these fields to the outgoing metric messages.

Fixes: #110

[1] https://review.opendev.org/q/topic:enhanced_metrics-stable/wallaby

* Add resource name field to outgoing sg-core metrics

Few Ceilometer meters like `cpu` & `network` have 2 name fields
in their metrics, `name` and `display_name`. Use delimiter ":"
to merge the values of both fields.

The `name` field provides extra information about the actual resource
related to the instance like `cirros:tap3a84e3fc-d9` in `network` meter
and `cirros:instance-00000001` in `cpu` meter.

---------

Co-authored-by: Leif Madsen <lmadsen@redhat.com>
* Add devstack plugin
@github-actions
Copy link

Coverage Status

@leifmadsen
Copy link
Member Author

@vyzigold are these failing tests expected to still be failing?

@vyzigold
Copy link
Contributor

Yes, the CI upstream is still blocked. We are waiting for some upstream folks to review and hopefully merge our attempt to downgrade pyparsing (we can't +2 the patch) https://review.opendev.org/c/openstack/requirements/+/898699 . After that it's basically on us (cloudops) to get the required fix in ceilometer merged. So after the downgrade is merged, stuff should start moving pretty fast.

@leifmadsen
Copy link
Member Author

Yes, the CI upstream is still blocked. We are waiting for some upstream folks to review and hopefully merge our attempt to downgrade pyparsing (we can't +2 the patch) https://review.opendev.org/c/openstack/requirements/+/898699 . After that it's basically on us (cloudops) to get the required fix in ceilometer merged. So after the downgrade is merged, stuff should start moving pretty fast.

I'm confused. Aren't the tests here local and unrelated to that patch?

@leifmadsen
Copy link
Member Author

Yes, the CI upstream is still blocked. We are waiting for some upstream folks to review and hopefully merge our attempt to downgrade pyparsing (we can't +2 the patch) https://review.opendev.org/c/openstack/requirements/+/898699 . After that it's basically on us (cloudops) to get the required fix in ceilometer merged. So after the downgrade is merged, stuff should start moving pretty fast.

I'm confused. Aren't the tests here local and unrelated to that patch?

Oh actually, I guess it's the issue with the Ceilometer container itself and the patch is for landing into that container which would be pulled into this test? I'm going to ignore the test here then. If everything else looks good, can you mark this PR as approved?

@vyzigold
Copy link
Contributor

I looked at the error in the CI. As far as I can tell, it's consistent with the ceilometer issue, for which we already have a fix on review upstream. So there shouldn't be an issue with sg-core, although the CI currently isn't able to test anything regarding the TCP transport.

@vyzigold
Copy link
Contributor

Yes, the CI upstream is still blocked. We are waiting for some upstream folks to review and hopefully merge our attempt to downgrade pyparsing (we can't +2 the patch) https://review.opendev.org/c/openstack/requirements/+/898699 . After that it's basically on us (cloudops) to get the required fix in ceilometer merged. So after the downgrade is merged, stuff should start moving pretty fast.

I'm confused. Aren't the tests here local and unrelated to that patch?

Oh actually, I guess it's the issue with the Ceilometer container itself and the patch is for landing into that container which would be pulled into this test? I'm going to ignore the test here then. If everything else looks good, can you mark this PR as approved?

The CI here pulls the current ceilometer master. Ceilometer doesn't yet test if the integration between ceilometer and sg-core works, so we managed to break the TCP publisher in ceilometer recently. Once the ceilometer master gets the fix, it'll appear in our CI here right away.

@leifmadsen
Copy link
Member Author

Thanks @vyzigold !

@leifmadsen leifmadsen merged commit 84cf82e into stable-1.5 Oct 26, 2023
13 of 15 checks passed
@leifmadsen leifmadsen deleted the import/stf153 branch October 26, 2023 18:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants