Skip to content

Commit

Permalink
Merge pull request #2465 from ezio-auditore/prom
Browse files Browse the repository at this point in the history
Added support for Prometheus
  • Loading branch information
openshift-merge-bot[bot] authored Mar 25, 2024
2 parents 9d387da + 9b6e143 commit 109acbb
Show file tree
Hide file tree
Showing 20 changed files with 832 additions and 6 deletions.
28 changes: 28 additions & 0 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,19 @@ rules:
- get
- list
- watch
- apiGroups:
- monitoring.coreos.com
resources:
- alertmanagers
- prometheuses
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- monitoring.coreos.com
resources:
Expand All @@ -186,6 +199,18 @@ rules:
- list
- update
- watch
- apiGroups:
- monitoring.coreos.com
resources:
- servicemonitors
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- noobaa.io
resources:
Expand Down Expand Up @@ -266,8 +291,11 @@ rules:
resources:
- clusterserviceversions
verbs:
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- operators.coreos.com
Expand Down
33 changes: 33 additions & 0 deletions controllers/defaults/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -224,4 +224,37 @@ var (
},
},
}

MonitoringResources = map[string]corev1.ResourceRequirements{
"kube-rbac-proxy": {
Requests: corev1.ResourceList{
"memory": resource.MustParse("30Mi"),
"cpu": resource.MustParse("50m"),
},
Limits: corev1.ResourceList{
"memory": resource.MustParse("30Mi"),
"cpu": resource.MustParse("50m"),
},
},
"alertmanager": {
Requests: corev1.ResourceList{
"cpu": resource.MustParse("100m"),
"memory": resource.MustParse("200Mi"),
},
Limits: corev1.ResourceList{
"cpu": resource.MustParse("100m"),
"memory": resource.MustParse("200Mi"),
},
},
"prometheus": {
Requests: corev1.ResourceList{
"cpu": resource.MustParse("400m"),
"memory": resource.MustParse("250Mi"),
},
Limits: corev1.ResourceList{
"cpu": resource.MustParse("400m"),
"memory": resource.MustParse("250Mi"),
},
},
}
)
Loading

0 comments on commit 109acbb

Please sign in to comment.