-
Notifications
You must be signed in to change notification settings - Fork 2.8k
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
Controller Group Metrics #26850
Merged
Merged
Controller Group Metrics #26850
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
asauber
commented
Jul 15, 2023
192bb01
to
de0daa5
Compare
9a37f74
to
2fdfa3d
Compare
/test |
learnitall
requested changes
Aug 10, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was one s/option/flag that was missed, but other than that lgtm. Thanks!
2fdfa3d
to
b262cce
Compare
/test |
Hit known flake #27431 |
b262cce
to
1fc0cb6
Compare
/test |
Add a ControllerGroup for all controllers. ControllerGroup is used to aggregate controllers which currently have a dynamic name, for example, per-Endpoint and per-CiliumNetworkPolicy controllers. ControllerGroups are used to expose a success/failure counter Prometheus metric for each group. A config option is added which allows the user to specify a set of controller group name strings, which override the default set of controller metrics which are enabled. The special values of "all" and "none" are supported. Implements a Controller hive.Cell for injection of the new Flag and Metric. Signed-off-by: Andrew Sauber <andrew.sauber@isovalent.com>
If a controller is "updated" (initialized, re-initialized) without a group name, this is considered an error. The controller will not export expected metrics without this group name. For now, we log this error and continue, as patterns are in development to take advantage of these metrics. Signed-off-by: Andrew Sauber <andrew.sauber@isovalent.com>
Add an array of controller group names to the Agent helm values which enables the configuration of per-subsystem status metrics. Signed-off-by: Andrew Sauber <andrew.sauber@isovalent.com>
Signed-off-by: Andrew Sauber <andrew.sauber@isovalent.com>
1fc0cb6
to
e5e1870
Compare
rebased again to pick up fix for #27431 |
/test |
learnitall
approved these changes
Aug 14, 2023
squeed
approved these changes
Aug 14, 2023
mhofstetter
added a commit
to mhofstetter/cilium
that referenced
this pull request
Nov 1, 2023
Hive config flags of type `StringSlice` are no longer splitted by space. Instead, they are splitted by comma. This leads to issues for config values that have been lately migrated to a Hive cell and didn't change this in the Helm files. Therefore, this commit changes the affected config values to pass them as a comma-separated string. * `prometheus.metrics` -> `metrics` * `prometheus.controllerGroupMetrics` -> `controller-group-metrics` * `ingressController.ingressLBAnnotationPrefixes` -> `ingress-lb-annotation-prefixies` * `loadBalancer.l7.ports` -> `loadbalancer-l7-ports` Fixes: cilium#26850, cilium#28794, cilium#28794 & cilium#28771 Suggested-by: Marco Iorio <marco.iorio@isovalent.com> Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
mhofstetter
added a commit
to mhofstetter/cilium
that referenced
this pull request
Nov 1, 2023
Hive config flags of type `StringSlice` are no longer split by space. Instead, they are split by comma. This leads to issues for config values that have been lately migrated to a Hive cell and didn't change this in the Helm files. Therefore, this commit changes the affected config values to pass them as a comma-separated string. * `prometheus.metrics` -> `metrics` * `prometheus.controllerGroupMetrics` -> `controller-group-metrics` * `ingressController.ingressLBAnnotationPrefixes` -> `ingress-lb-annotation-prefixies` * `loadBalancer.l7.ports` -> `loadbalancer-l7-ports` Fixes: cilium#26850, cilium#28794, cilium#28794 & cilium#28771 Suggested-by: Marco Iorio <marco.iorio@isovalent.com> Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
mhofstetter
added a commit
to mhofstetter/cilium
that referenced
this pull request
Nov 1, 2023
Hive config flags of type `StringSlice` are no longer split by space. Instead, they are split by comma. This leads to issues for config values that have been lately migrated to a Hive cell and didn't change this in the Helm files. Therefore, this commit changes the affected config values to pass them as a comma-separated string. * `prometheus.metrics` -> `metrics` * `prometheus.controllerGroupMetrics` -> `controller-group-metrics` Fixes: cilium#26850, cilium#28771 Suggested-by: Marco Iorio <marco.iorio@isovalent.com> Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
mhofstetter
added a commit
to mhofstetter/cilium
that referenced
this pull request
Nov 1, 2023
Hive config flags of type `StringSlice` are no longer split by space. Instead, they are split by comma. This leads to issues for config values that have been lately migrated to a Hive cell and didn't change this in the Helm files. Therefore, this commit changes the affected config values to pass them as a comma-separated string. * `prometheus.metrics` -> `metrics` * `prometheus.controllerGroupMetrics` -> `controller-group-metrics` Fixes: cilium#26850, cilium#28771 Suggested-by: Marco Iorio <marco.iorio@isovalent.com> Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
mhofstetter
added a commit
to mhofstetter/cilium
that referenced
this pull request
Nov 1, 2023
Hive config flags of type `StringSlice` are no longer split by space. Instead, they are split by comma. This leads to issues for config values that have been lately migrated to a Hive cell and didn't change this in the Helm files. Therefore, this commit changes the affected config values to pass them as a comma-separated string. * `prometheus.metrics` -> `metrics` * `prometheus.controllerGroupMetrics` -> `controller-group-metrics` Fixes: cilium#26850, cilium#28771 Suggested-by: Marco Iorio <marco.iorio@isovalent.com> Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
mhofstetter
added a commit
to mhofstetter/cilium
that referenced
this pull request
Nov 1, 2023
Hive config flags of type `StringSlice` are no longer split by space. Instead, they are split by comma. This leads to issues for config values that have been lately migrated to a Hive cell and didn't change this in the Helm files. Therefore, this commit changes the affected config values to pass them as a comma-separated string. * `prometheus.metrics` -> `metrics` * `prometheus.controllerGroupMetrics` -> `controller-group-metrics` Fixes: cilium#26850, cilium#28771 Suggested-by: Marco Iorio <marco.iorio@isovalent.com> Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
mhofstetter
added a commit
to mhofstetter/cilium
that referenced
this pull request
Nov 9, 2023
Hive config flags of type `StringSlice` are no longer split by space. Instead, they are split by comma. This leads to issues for config values that have been lately migrated to a Hive cell and didn't change this in the Helm files. Therefore, this commit changes the affected config values to pass them as a comma-separated string. * `prometheus.metrics` -> `metrics` * `prometheus.controllerGroupMetrics` -> `controller-group-metrics` Fixes: cilium#26850, cilium#28771 Suggested-by: Marco Iorio <marco.iorio@isovalent.com> Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
area/daemon
Impacts operation of the Cilium daemon.
area/metrics
Impacts statistics / metrics gathering, eg via Prometheus.
area/misc
Impacts miscellaneous areas of the code not otherwise owned by another area.
kind/enhancement
This would improve or streamline existing functionality.
ready-to-merge
This PR has passed all tests and received consensus from code owners to merge.
release-note/minor
This PR changes functionality that users may find relevant to operating Cilium.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Controller Group Metrics
Add a ControllerGroup for all controllers. ControllerGroup is used to
aggregate controllers which currently have a dynamic name, for example,
per-Endpoint and per-CiliumNetworkPolicy controllers.
ControllerGroups are used to expose a success/failure counter
Prometheus metric for each group. Each ControllerGroup also has a flag
which indicates if the metric should be enabled by default.
A config option is added which allows the user to specify a set of
controller group name strings, which override the default set of
controller metrics which are enabled. The special values of "all" and
"none" are supported.
Example Usage
With
controller-group-metrics: "all"
With
controller-group-metrics: "sync-policymap sync-host-ips restore-endpoint-identity"
With
controller-group-metrics: "none all sync-policymap sync-host-ips restore-endpoint-identity"
Release note: