fix for https://issues.redhat.com/browse/LOG-1647

[pmoogi-redhat]

Description

Fixes the below reported issue "error_class=Prometheus::Client::LabelSetValidator::InvalidLabelSetError error="labels must have the same signature (keys given: [:hostname, :path, :plugin_id, :type] vs. keys expected: [:containername, :hostname, :namespace, :path, :plugin_id, :podname, :type]"

/cc @jcantrill /assign @jcantrill

Links

• Depending on PR(s):
• Bugzilla:
• Github issue:
• JIRA: fix for https://issues.redhat.com/browse/LOG-1647
• Enhancement proposal:

[jcantrill]

/hold /approve

@pmoogi-redhat please add a test that exposes the issue and demonstrates a fix

[jcantrill]

/approve

[pmoogi-redhat]

/test cluster-logging-operator-e2e

[pmoogi-redhat]

/test elastic-operator-e2e

[jcantrill]

/retest

@pmoogi-redhat I thought we discussed a fix which required registering additional fields. I don't see that change here.

[jcantrill]

/retest

[jcantrill]

/hold cancel

[jcantrill]

/test cluster-logging-operator-e2e

[jcantrill]

/cherrypick release-5.2

[openshift-cherrypick-robot]

@jcantrill: once the present PR merges, I will cherry-pick it on top of release-5.2 in a new PR and assign it to you.

In response to [this](https://github.com/openshift/origin-aggregated-logging/pull/2163#issuecomment-901179075): >/cherrypick release-5.2 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.

[pmoogi-redhat]

/retest

[jcantrill]

/lgtm /retest

[jcantrill]

/cherrypick master

[openshift-cherrypick-robot]

@jcantrill: once the present PR merges, I will cherry-pick it on top of master in a new PR and assign it to you.

In response to [this](https://github.com/openshift/origin-aggregated-logging/pull/2163#issuecomment-904127204): >/cherrypick master Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.

[openshift-ci[bot]]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcantrill, pmoogi-redhat

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/openshift/origin-aggregated-logging/blob/release-5.2/OWNERS)~~ [jcantrill] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment

[openshift-bot]

/retest-required

Please review the full test history for this PR and help us cut down flakes.

[openshift-bot]

/retest-required

Please review the full test history for this PR and help us cut down flakes.

[openshift-cherrypick-robot]

@jcantrill: base branch (release-5.2) needs to differ from target branch (release-5.2)

In response to [this](https://github.com/openshift/origin-aggregated-logging/pull/2163#issuecomment-901179075): >/cherrypick release-5.2 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.

[openshift-cherrypick-robot]

@jcantrill: new pull request created: #2169

In response to [this](https://github.com/openshift/origin-aggregated-logging/pull/2163#issuecomment-904127204): >/cherrypick master Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.