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

[RHOBS-1009/ACM-8509]: Add ServiceMonitor for metrics-collector and instrument it properly #1336

Closed
wants to merge 56 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
9a3c26d
Hub Metrics Collection (#1339)
coleenquadros Feb 20, 2024
03a4517
Update placementrule_controller.go
coleenquadros Feb 20, 2024
26b3c3e
lint (#1341)
coleenquadros Feb 20, 2024
f8457db
lint
coleenquadros Feb 21, 2024
c5bf6d2
lint
coleenquadros Feb 21, 2024
3c8cadd
change server ca cert
coleenquadros Feb 21, 2024
175b49d
lint
coleenquadros Feb 21, 2024
3913b5a
make sure hub metrics collection resources are properly cleaned up
coleenquadros Feb 21, 2024
887a199
lint
coleenquadros Feb 21, 2024
0bfb234
remove obs add on for local-cluster
coleenquadros Feb 21, 2024
e3404a9
cleanup when mco cr is removed
coleenquadros Feb 21, 2024
20733d4
test cleanup
coleenquadros Feb 21, 2024
ae0ad20
remove additional watch for hub endpoint
coleenquadros Feb 21, 2024
5b8ef85
typo
coleenquadros Feb 21, 2024
c72398f
delete resources refactor
coleenquadros Feb 21, 2024
3665640
typo
coleenquadros Feb 21, 2024
bb6133f
support local-cluster labels in rbac-query-proxy
subbarao-meduri Feb 22, 2024
cfb2743
metrics collector replica
coleenquadros Feb 22, 2024
f8c0a90
comment proxy chnages for local-cluster
coleenquadros Feb 22, 2024
a3b69b5
add back proxy changes
coleenquadros Feb 22, 2024
8e7afaf
cleanup
coleenquadros Feb 22, 2024
eca8144
cleanup ocp configs
coleenquadros Feb 22, 2024
1119a5f
refactor
coleenquadros Feb 22, 2024
c5dc78e
remove unused var
coleenquadros Feb 22, 2024
a3d5272
fix resource requests setting for hub metrics collector
coleenquadros Feb 22, 2024
a586ea6
lint
coleenquadros Feb 22, 2024
9ccfb2c
get resource requirements refactor
coleenquadros Feb 22, 2024
ba3a018
test clean
coleenquadros Feb 22, 2024
a67df62
refactor hub metrics collector resource
coleenquadros Feb 22, 2024
9b7f502
resource refactor
coleenquadros Feb 22, 2024
a828756
resource refactor
coleenquadros Feb 22, 2024
ebffbee
remove proxy changes
coleenquadros Feb 23, 2024
9d1f547
only watch endpoint
coleenquadros Feb 23, 2024
da79987
refactor hub metrics resource logic
coleenquadros Feb 23, 2024
4520002
clean resources
coleenquadros Feb 23, 2024
a0705c2
Do not access mco resource after delete is initiated
subbarao-meduri Feb 26, 2024
75406b0
[RHOBS-1009/ACM-8509]: Add ServiceMonitor for metrics-collector and i…
saswatamcode Feb 20, 2024
236bde0
fix test
saswatamcode Feb 20, 2024
5eee2e6
Add status code label to metrics and clean up
saswatamcode Feb 20, 2024
e2b68cf
Ensure ServiceMonitor is properly configured and authenticated accord…
saswatamcode Feb 21, 2024
8650d23
Fix lint
saswatamcode Feb 21, 2024
0b8b663
Use correct image for kube-rbac-proxy
saswatamcode Feb 21, 2024
ea89fb2
Correct indentation for kube-rbac-proxy secret
saswatamcode Feb 22, 2024
eddbb8b
Correct servicemonitor and add ns monitoring label
saswatamcode Feb 22, 2024
d052a26
Correct deployment label and test
saswatamcode Feb 22, 2024
62a8247
Skip KRP
saswatamcode Feb 22, 2024
2d5c0b7
Final port/scheme fix
saswatamcode Feb 22, 2024
c753612
Add local alerting rules
saswatamcode Feb 22, 2024
d3bcd44
Add apiextensionsv1 to scheme
saswatamcode Feb 22, 2024
c4d0625
Add resource version to crd update
saswatamcode Feb 22, 2024
be30901
Fix formatting
saswatamcode Feb 22, 2024
fa93135
Only import once
saswatamcode Feb 22, 2024
552dba9
Don't create krp resources
saswatamcode Feb 26, 2024
b19db57
Fix lint
saswatamcode Feb 26, 2024
e33f472
Fix lint
saswatamcode Feb 26, 2024
2506b11
Comment unused
saswatamcode Feb 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix lint
Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
  • Loading branch information
saswatamcode committed Feb 26, 2024
commit 8650d23e3fd147efd744d6f73c96a3f6e42ed6d0
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ import (
const (
metricsCollectorName = "metrics-collector-deployment"
uwlMetricsCollectorName = "uwl-metrics-collector-deployment"
metricsCollector = "metrics-collector"
uwlMetricsCollector = "uwl-metrics-collector"
selectorKey = "component"
selectorValue = "metrics-collector"
selectorValue = metricsCollector
caMounthPath = "/etc/serving-certs-ca-bundle"
caVolName = "serving-certs-ca-bundle"
mtlsCertName = "observability-controller-open-cluster-management.io-observability-signer-client-cert"
Expand Down Expand Up @@ -182,9 +184,9 @@ func getCommands(params CollectorParams) []string {

func createDeployment(params CollectorParams) *appsv1.Deployment {
falsePtr := false
secretName := "metrics-collector"
secretName := metricsCollector
if params.isUWL {
secretName = "uwl-metrics-collector"
secretName = uwlMetricsCollector
}
volumes := []corev1.Volume{
{
Expand Down Expand Up @@ -303,7 +305,7 @@ func createDeployment(params CollectorParams) *appsv1.Deployment {
ServiceAccountName: serviceAccountName,
Containers: []corev1.Container{
{
Name: "metrics-collector",
Name: metricsCollector,
Image: rendering.Images[operatorconfig.MetricsCollectorKey],
Command: commands,
Env: []corev1.EnvVar{
Expand Down Expand Up @@ -437,9 +439,9 @@ func createDeployment(params CollectorParams) *appsv1.Deployment {
}

func createKubeRbacProxySecret(params CollectorParams) *corev1.Secret {
name := "metrics-collector"
name := metricsCollector
if params.isUWL {
name = "uwl-metrics-collector"
name = uwlMetricsCollector
}
secret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Expand All @@ -462,9 +464,9 @@ func createKubeRbacProxySecret(params CollectorParams) *corev1.Secret {
}

func createService(params CollectorParams) *corev1.Service {
name := "metrics-collector"
name := metricsCollector
if params.isUWL {
name = "uwl-metrics-collector"
name = uwlMetricsCollector
}
return &corev1.Service{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -495,9 +497,9 @@ func createService(params CollectorParams) *corev1.Service {
}

func createClientCAConfigMap(params CollectorParams) *corev1.ConfigMap {
name := "metrics-collector"
name := metricsCollector
if params.isUWL {
name = "uwl-metrics-collector"
name = uwlMetricsCollector
}

return &corev1.ConfigMap{
Expand All @@ -510,10 +512,10 @@ func createClientCAConfigMap(params CollectorParams) *corev1.ConfigMap {

// createServiceMonitor creates a ServiceMonitor for the metrics collector.
func createServiceMonitor(params CollectorParams) *promv1.ServiceMonitor {
name := "metrics-collector"
name := metricsCollector
replace := "acm_metrics_collector_${1}"
if params.isUWL {
name = "uwl-metrics-collector"
name = uwlMetricsCollector
replace = "acm_uwl_metrics_collector_${1}"
}

Expand Down Expand Up @@ -661,9 +663,9 @@ func syncClientCA(ctx context.Context, c client.Client, cfgMap *corev1.ConfigMap
func updateMetricsCollector(ctx context.Context, c client.Client, params CollectorParams,
forceRestart bool) (bool, error) {
name := metricsCollectorName
resourceName := "metrics-collector"
resourceName := metricsCollector
if params.isUWL {
resourceName = "uwl-metrics-collector"
resourceName = uwlMetricsCollector
name = uwlMetricsCollectorName
}

Expand Down