~data-platform/+git/opensearch-observability:lp-2.11.1

Last commit made on 2023-11-13
Get this branch:
git clone -b lp-2.11.1 https://git.launchpad.net/~data-platform/+git/opensearch-observability
Members of Canonical Data Platform can upload to this branch. Log in for directions.

Branch merges

Branch information

Recent commits

934521d... by "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>

Increment version to 2.11.1-SNAPSHOT (#1761)

Signed-off-by: opensearch-ci-bot <email address hidden>
Co-authored-by: opensearch-ci-bot <email address hidden>

3b6d40e... by "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>

Upgrade JSON to 20231013 to fix CVE-2023-5072 (#1750) (#1752)

(cherry picked from commit fe38a6c1f2bffed729fa24ade493a8e4e10c513a)

Signed-off-by: Derek Ho <email address hidden>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

bd11e81... by "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>

Updates demo certs used in integ tests (#1626) (#1627)

(cherry picked from commit d2c087c80f14c9a80566d0f5914e8fafd4f952ed)

Signed-off-by: Peng Huo <email address hidden>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

462969f... by "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>

Increment version to 2.11.0-SNAPSHOT (#1601)

Signed-off-by: opensearch-ci-bot <email address hidden>
Co-authored-by: opensearch-ci-bot <email address hidden>

1da24e2... by Shenoy Pratik <email address hidden>

Update backport CI, add PR merged condition (#1593)

Signed-off-by: Shenoy Pratik <email address hidden>

a4b02dd... by Derek Ho <email address hidden>

Fix from upstream core.action changes (#1590) (#1591)

* Fix from upstream core.action changes (#1590)

* fix from upstream

Signed-off-by: Derek Ho <email address hidden>

* pull latest snaphost

Signed-off-by: Derek Ho <email address hidden>

---------

Signed-off-by: Derek Ho <email address hidden>
(cherry picked from commit 033779cffb797f2afdeaf38552849571875dcc38)
Signed-off-by: Derek Ho <email address hidden>

* Update build.gradle

Revert build.gradle

Signed-off-by: Derek Ho <email address hidden>

---------

Signed-off-by: Derek Ho <email address hidden>

4bf4bda... by Derek Ho <email address hidden>

fix 2.x build (#1582)

Signed-off-by: Derek Ho <email address hidden>

8db71c9... by Derek Ho <email address hidden>

Backport/backport 1572 to 2.x (#1580)

* remove job scheduler (#1560)

* remove job scheduler

Signed-off-by: Derek Ho <email address hidden>

* remove job scheduler files and build.gradle

Signed-off-by: Derek Ho <email address hidden>

* ktlint

Signed-off-by: Derek Ho <email address hidden>

* add back job scheduler to fix bwc

Signed-off-by: Derek Ho <email address hidden>

* remove job scheduler and add it back for older version

Signed-off-by: Derek Ho <email address hidden>

* remove job scheduler in prepare Bwc Tests

Signed-off-by: Derek Ho <email address hidden>

* bump bwc version

Signed-off-by: Derek Ho <email address hidden>

* add todo of removing job scheduler things after 2.9 release

Signed-off-by: Derek Ho <email address hidden>

---------

Signed-off-by: Derek Ho <email address hidden>
(cherry picked from commit 4e0ca5ab59747d84c14441db0973fbc2a0dc5574)
Signed-off-by: Derek Ho <email address hidden>

* Resolve build issue (#1572)

* resolve dependency issues

Signed-off-by: Eric <email address hidden>

* resolve jacocoagent missing issue

Signed-off-by: Eric <email address hidden>

* bump up build.gradle

Signed-off-by: Derek Ho <email address hidden>

---------

Signed-off-by: Eric <email address hidden>
Signed-off-by: Derek Ho <email address hidden>
Co-authored-by: Derek Ho <email address hidden>
(cherry picked from commit 4345041ed16ba89082c481c9e8e326ffa1f73739)
Signed-off-by: Derek Ho <email address hidden>

* try get older common utils

Signed-off-by: Derek Ho <email address hidden>

* revert back

Signed-off-by: Derek Ho <email address hidden>

* revert kotlin version change

Signed-off-by: Derek Ho <email address hidden>

* additional core changes

Signed-off-by: Derek Ho <email address hidden>

* update import orderings

Signed-off-by: Derek Ho <email address hidden>

---------

Signed-off-by: Derek Ho <email address hidden>
Signed-off-by: Eric <email address hidden>
Co-authored-by: Eric Wei <email address hidden>

7b4b7d8... by "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>

Increment version to 2.10.0-SNAPSHOT (#1568)

Signed-off-by: opensearch-ci-bot <email address hidden>
Co-authored-by: opensearch-ci-bot <email address hidden>

aeb39af... by Derek Ho <email address hidden>

remove job scheduler (#1560) (#1563)

* remove job scheduler

* remove job scheduler files and build.gradle

* ktlint

* add back job scheduler to fix bwc

* remove job scheduler and add it back for older version

* remove job scheduler in prepare Bwc Tests

* bump bwc version

* add todo of removing job scheduler things after 2.9 release

---------

(cherry picked from commit 4e0ca5ab59747d84c14441db0973fbc2a0dc5574)

Signed-off-by: Derek Ho <email address hidden>