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

🥗 Feature/argocd metrics 🥗 #117

Merged
merged 6 commits into from
Apr 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,11 @@ TODO - add some instructions for adding:
1) new helm charts
2) new Operators etc

## Metrics

By setting `argocd.metrics.enabled: true` in `values-bootstrap.yaml`, promethus and grafana are deployed by the operator to capture argocd metrics.

An example of the latest grafana dashboard for argocd is available here
- https://raw.githubusercontent.com/argoproj/argo-cd/master/examples/dashboard.json

## Contributing
25 changes: 24 additions & 1 deletion bootstrap/templates/argocd-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
name: argocd-operator
source: community-operators
sourceNamespace: openshift-marketplace
startingCSV: argocd-operator.v0.0.6
startingCSV: {{ .Values.argocd.operator.version | quote }}
---
apiVersion: argoproj.io/v1alpha1
kind: ArgoCD
Expand All @@ -77,11 +77,19 @@ spec:
ha:
enabled: false
grafana:
{{- if .Values.argocd.metrics.enabled }}
enabled: true
{{- else }}
enabled: false
{{- end }}
route: true
size: 1
prometheus:
{{- if .Values.argocd.metrics.enabled }}
enabled: true
{{- else }}
enabled: false
{{- end }}
route: true
size: 1
rbac:
Expand All @@ -101,4 +109,19 @@ spec:
statusBadgeEnabled: true
usersAnonymousEnabled: false
version: {{ .Values.argocd.version | quote }}
---
{{- if .Values.argocd.metrics.enabled }}
apiVersion: operators.coreos.com/v1alpha1
kind: Subscription
metadata:
name: prometheus-operator
spec:
channel: beta
installPlanApproval: Automatic
name: prometheus
source: community-operators
sourceNamespace: openshift-marketplace
startingCSV: {{ .Values.argocd.metrics.prometheus.version | quote }}
{{- end }}
---
{{- end }}
8 changes: 7 additions & 1 deletion bootstrap/values-bootstrap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,13 @@ bootstrap-project:

argocd:
enabled: true
name: argocd
name: labs-argocd
namespace: *ci_cd
version: v1.5.2
instancelabel: redhat.com/ubiquitous-journey
metrics:
enabled: true
prometheus:
version: prometheusoperator.0.32.0
operator:
version: argocd-operator.v0.0.6