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

NETOBSERV-1672: add cluster & zone to predefined metrics #665

Merged
merged 2 commits into from
Jun 4, 2024
Merged

NETOBSERV-1672: add cluster & zone to predefined metrics #665

merged 2 commits into from
Jun 4, 2024

Conversation

jotak
Copy link
Member

@jotak jotak commented May 30, 2024

Description

Add cluster & zone to predefined metrics
They're only added when those features are enabled.

Dependencies

n/a

Checklist

If you are not familiar with our processes or don't know what to answer in the list below, let us know in a comment: the maintainers will take care of that.

  • Is this PR backed with a JIRA ticket? If so, make sure it is written as a title prefix (in general, PRs affecting the NetObserv/Network Observability product should be backed with a JIRA ticket - especially if they bring user facing changes).
  • Does this PR require product documentation?
    • If so, make sure the JIRA epic is labelled with "documentation" and provides a description relevant for doc writers, such as use cases or scenarios. Any required step to activate or configure the feature should be documented there, such as new CRD knobs.
  • Does this PR require a product release notes entry?
    • If so, fill in "Release Note Text" in the JIRA.
  • Is there anything else the QE team should know before testing? E.g: configuration changes, environment setup, etc.
    • If so, make sure it is described in the JIRA ticket.
  • QE requirements (check 1 from the list):
    • Standard QE validation, with pre-merge tests unless stated otherwise.
    • Regression tests only (e.g. refactoring with no user-facing change).
    • No QE (e.g. trivial change with high reviewer's confidence, or per agreement with the QE team).

@jotak
NETOBSERV-1672: add cluster & zone to predefined metrics
ae3eb06 
They're only added when those features are enabled.
@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented May 30, 2024 •
edited by openshift-ci bot

@jotak: This pull request references NETOBSERV-1672 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.17.0" version, but no target version was set.

In response to this:

Description

Add cluster & zone to predefined metrics
They're only added when those features are enabled.

Dependencies

n/a

Checklist

If you are not familiar with our processes or don't know what to answer in the list below, let us know in a comment: the maintainers will take care of that.

  • Is this PR backed with a JIRA ticket? If so, make sure it is written as a title prefix (in general, PRs affecting the NetObserv/Network Observability product should be backed with a JIRA ticket - especially if they bring user facing changes).
  • Does this PR require product documentation?
  • If so, make sure the JIRA epic is labelled with "documentation" and provides a description relevant for doc writers, such as use cases or scenarios. Any required step to activate or configure the feature should be documented there, such as new CRD knobs.
  • Does this PR require a product release notes entry?
  • If so, fill in "Release Note Text" in the JIRA.
  • Is there anything else the QE team should know before testing? E.g: configuration changes, environment setup, etc.
  • If so, make sure it is described in the JIRA ticket.
  • QE requirements (check 1 from the list):
  • Standard QE validation, with pre-merge tests unless stated otherwise.
  • Regression tests only (e.g. refactoring with no user-facing change).
  • No QE (e.g. trivial change with high reviewer's confidence, or per agreement with the QE team).

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@jotak jotak added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label May 30, 2024
@github-actions GitHub Actions
Copy link

New images:

  • quay.io/netobserv/network-observability-operator:c20ce8c
  • quay.io/netobserv/network-observability-operator-bundle:v0.0.0-c20ce8c
  • quay.io/netobserv/network-observability-operator-catalog:v0.0.0-c20ce8c

They will expire after two weeks.

To deploy this build:

# Direct deployment, from operator repo
IMAGE=quay.io/netobserv/network-observability-operator:c20ce8c make deploy

# Or using operator-sdk
operator-sdk run bundle quay.io/netobserv/network-observability-operator-bundle:v0.0.0-c20ce8c

Or as a Catalog Source:

apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
  name: netobserv-dev
  namespace: openshift-marketplace
spec:
  sourceType: grpc
  image: quay.io/netobserv/network-observability-operator-catalog:v0.0.0-c20ce8c
  displayName: NetObserv development catalog
  publisher: Me
  updateStrategy:
    registryPoll:
      interval: 1m

@github-actions github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Jun 3, 2024
@jotak jotak added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Jun 3, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 3, 2024

New images:

  • quay.io/netobserv/network-observability-operator:a3ff45b
  • quay.io/netobserv/network-observability-operator-bundle:v0.0.0-a3ff45b
  • quay.io/netobserv/network-observability-operator-catalog:v0.0.0-a3ff45b

They will expire after two weeks.

To deploy this build:

# Direct deployment, from operator repo
IMAGE=quay.io/netobserv/network-observability-operator:a3ff45b make deploy

# Or using operator-sdk
operator-sdk run bundle quay.io/netobserv/network-observability-operator-bundle:v0.0.0-a3ff45b

Or as a Catalog Source:

apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
  name: netobserv-dev
  namespace: openshift-marketplace
spec:
  sourceType: grpc
  image: quay.io/netobserv/network-observability-operator-catalog:v0.0.0-a3ff45b
  displayName: NetObserv development catalog
  publisher: Me
  updateStrategy:
    registryPoll:
      interval: 1m

@openshift-ci openshift-ci bot added the lgtm label Jun 3, 2024
memodi
memodi requested changes Jun 3, 2024
View reviewed changes
Copy link
Contributor

@memodi memodi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jotak - I can see the views for Zone, however cluster aggregation is still missing. When Prom. as datasource is selected (when Loki is enabled) I get error as:

Unable to get topology
Can't build query: this request could not be performed with Prometheus metrics, as they are missing some of the required labels. Try using different filters and/or aggregations. For example, try removing these dependencies from your query: K8S_ClusterName. Alternatively, you may also install and enable Loki

Cluster option is not enabled when loki is disabled and Prom. is enabled.

@openshift-ci openshift-ci bot removed the lgtm label Jun 3, 2024
@jotak
Copy link
Member Author

jotak commented Jun 4, 2024 •
edited

@memodi did you use the latest generated image, not the first one? ie. a3ff45b and not c20ce8c. Because I had this same problem at first and I (should have) fixed it in the second build

Edit: I have this, using the second build:
Capture d’écran du 2024-06-04 11-30-38

@memodi
Copy link
Contributor

memodi commented Jun 4, 2024

@memodi did you use the latest generated image, not the first one? ie. a3ff45b and not c20ce8c. Because I had this same problem at first and I (should have) fixed it in the second build

ah, yes, I had used a3ff45b, I'll try with with c20ce8c

@memodi
Copy link
Contributor

memodi commented Jun 4, 2024

thanks @jotak , a3ff45b works.

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved QE has approved this pull request label Jun 4, 2024
@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented Jun 4, 2024 •
edited by openshift-ci bot

@jotak: This pull request references NETOBSERV-1672 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.17.0" version, but no target version was set.

In response to this:

Description

Add cluster & zone to predefined metrics
They're only added when those features are enabled.

Dependencies

n/a

Checklist

If you are not familiar with our processes or don't know what to answer in the list below, let us know in a comment: the maintainers will take care of that.

  • Is this PR backed with a JIRA ticket? If so, make sure it is written as a title prefix (in general, PRs affecting the NetObserv/Network Observability product should be backed with a JIRA ticket - especially if they bring user facing changes).
  • Does this PR require product documentation?
  • If so, make sure the JIRA epic is labelled with "documentation" and provides a description relevant for doc writers, such as use cases or scenarios. Any required step to activate or configure the feature should be documented there, such as new CRD knobs.
  • Does this PR require a product release notes entry?
  • If so, fill in "Release Note Text" in the JIRA.
  • Is there anything else the QE team should know before testing? E.g: configuration changes, environment setup, etc.
  • If so, make sure it is described in the JIRA ticket.
  • QE requirements (check 1 from the list):
  • Standard QE validation, with pre-merge tests unless stated otherwise.
  • Regression tests only (e.g. refactoring with no user-facing change).
  • No QE (e.g. trivial change with high reviewer's confidence, or per agreement with the QE team).

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@jotak
Copy link
Member Author

jotak commented Jun 4, 2024

/test e2e-operator

@jotak
Copy link
Member Author

jotak commented Jun 4, 2024

/approve

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jun 4, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jotak

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:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved label Jun 4, 2024
@jotak jotak requested a review from memodi June 4, 2024 15:24
@jotak jotak merged commit bf5f147 into netobserv:main Jun 4, 2024
11 of 12 checks passed
jotak added a commit to jotak/network-observability-operator that referenced this pull request Jun 4, 2024
@jotak
NETOBSERV-1672: add cluster & zone to predefined metrics (netobserv#665)
0189f2d 
* NETOBSERV-1672: add cluster & zone to predefined metrics

They're only added when those features are enabled.

* fix Clustername => ClusterName
@jotak jotak mentioned this pull request Jun 4, 2024
Merged
jotak added a commit that referenced this pull request Jun 4, 2024
@jotak
NETOBSERV-1672: add cluster & zone to predefined metrics (#665) (#668)
df5db3b 
* NETOBSERV-1672: add cluster & zone to predefined metrics

They're only added when those features are enabled.

* fix Clustername => ClusterName
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jpinsonneau jpinsonneau jpinsonneau approved these changes

@msherif1234 msherif1234 Awaiting requested review from msherif1234

@OlivierCazade OlivierCazade Awaiting requested review from OlivierCazade

@memodi memodi Awaiting requested review from memodi

Assignees

@memodi memodi

@jpinsonneau jpinsonneau

Labels
approved jira/valid-reference ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. qe-approved QE has approved this pull request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jotak @openshift-ci-robot @memodi @jpinsonneau