airship/charts
Code Issues Proposed changes

feat(grafana-gerrit) Integrate the grafana dashboard into Gerrit

Browse Source 
Added url to jarvis system details link after jarvis pipeline posts details.
Link directs to Grafana Dashboard based on Namespace, Pipeline, Pipeline Run name.

Details provided for Success, Failure.

Change-Id: I3cddb6ddccac263213e11be9b991a2d0869afee7
This commit is contained in:
mn9209
2021-01-27 13:19:43 -06:00
committed by Matthew Neafie
parent 606cde5a95
commit e62e239838
9 changed files with 59 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
charts/jarvis-system/templates/Pipeline-createFailure.yaml
View File

@@ -11,6 +11,9 @@ spec:
- name: changeNumber - name: changeNumber
- name: patchSetNumber - name: patchSetNumber
- name: checkerUUID - name: checkerUUID
- name: pipelineName
- name: pipelineRunName
- name: pipelineRunNamespace
tasks: tasks:
- name: createfailure - name: createfailure
taskRef: taskRef:
@@ -26,6 +29,12 @@ spec:
value: $(params.patchSetNumber) value: $(params.patchSetNumber)
- name: checkerUUID - name: checkerUUID
value: $(params.checkerUUID) value: $(params.checkerUUID)
- name: pipelineName
value: $(params.pipelineName)
- name: pipelineRunName
value: $(params.pipelineRunName)
- name: pipelineRunNamespace
value: $(params.pipelineRunNamespace)
... ...
{{- end -}} {{- end -}}
{{- include "helpers.template.overlay" ( dict "Global" $ "template_definition" "Pipeline-createFailure" ) }} {{- include "helpers.template.overlay" ( dict "Global" $ "template_definition" "Pipeline-createFailure" ) }}

9
charts/jarvis-system/templates/Pipeline-createSuccess.yaml
View File

@@ -11,6 +11,9 @@ spec:
- name: changeNumber - name: changeNumber
- name: patchSetNumber - name: patchSetNumber
- name: checkerUUID - name: checkerUUID
- name: pipelineName
- name: pipelineRunName
- name: pipelineRunNamespace
tasks: tasks:
- name: createsuccess - name: createsuccess
taskRef: taskRef:
@@ -26,6 +29,12 @@ spec:
value: $(params.patchSetNumber) value: $(params.patchSetNumber)
- name: checkerUUID - name: checkerUUID
value: $(params.checkerUUID) value: $(params.checkerUUID)
- name: pipelineName
value: $(params.pipelineName)
- name: pipelineRunName
value: $(params.pipelineRunName)
- name: pipelineRunNamespace
value: $(params.pipelineRunNamespace)
... ...
{{- end -}} {{- end -}}
{{- include "helpers.template.overlay" ( dict "Global" $ "template_definition" "Pipeline-createSuccess" ) }} {{- include "helpers.template.overlay" ( dict "Global" $ "template_definition" "Pipeline-createSuccess" ) }}

14
charts/jarvis-system/templates/Task-createFailure.yaml
View File

@@ -11,18 +11,12 @@ spec:
- name: changeNumber - name: changeNumber
- name: patchSetNumber - name: patchSetNumber
- name: checkerUUID - name: checkerUUID
- name: pipelineName
- name: pipelineRunName
- name: pipelineRunNamespace
steps: steps:
- name: createfailure - name: createfailure
image: {{ include "helpers.pod.container.image" ( dict "Global" $ "Application" "task_curl" ) }} image: {{ include "helpers.pod.container.image" ( dict "Global" $ "Application" "task_curl" ) }}
env:
- name: "JARVIS_TASKRUN_NAMESPACE"
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: "JARVIS_TASKRUN_NAME"
valueFrom:
fieldRef:
fieldPath: metadata.labels['tekton.dev/taskRun']
volumeMounts: volumeMounts:
- name: gerrit-netrc - name: gerrit-netrc
mountPath: /run/jarvis/gerrit-netrc mountPath: /run/jarvis/gerrit-netrc
@@ -42,7 +36,7 @@ spec:
{ {
"checker_uuid": "$(params.checkerUUID)", "checker_uuid": "$(params.checkerUUID)",
"state": "FAILED", "state": "FAILED",
"url": "http://{{ .Values.params.tekton.dashboard.host }}/#/namespaces/${JARVIS_TASKRUN_NAMESPACE}/taskruns/${JARVIS_TASKRUN_NAME}", "url": "https://{{ .Values.params.grafana.dashboard.host }}/d/{{ .Values.params.grafana.dashboard.uid }}/{{ .Values.params.grafana.dashboard.title }}?orgId={{ .Values.params.grafana.dashboard.orgid }}&var-namespace=$(params.pipelineRunNamespace)&var-tekton_dev_pipeline=$(params.pipelineName)&var-tekton_dev_pipelineRun=$(params.pipelineRunName)&var-tekton_dev_taskRun=All",
"message": "Jarvis failed to process the run for change #$(params.changeNumber) ps #$(params.patchSetNumber) to the $(params.project) repo", "message": "Jarvis failed to process the run for change #$(params.changeNumber) ps #$(params.patchSetNumber) to the $(params.project) repo",
"finished": "$(date --utc '+%F %T.%N')" "finished": "$(date --utc '+%F %T.%N')"
} }

14
charts/jarvis-system/templates/Task-createSuccess.yaml
View File

@@ -11,18 +11,12 @@ spec:
- name: changeNumber - name: changeNumber
- name: patchSetNumber - name: patchSetNumber
- name: checkerUUID - name: checkerUUID
- name: pipelineName
- name: pipelineRunName
- name: pipelineRunNamespace
steps: steps:
- name: createsuccess - name: createsuccess
image: {{ include "helpers.pod.container.image" ( dict "Global" $ "Application" "task_curl" ) }} image: {{ include "helpers.pod.container.image" ( dict "Global" $ "Application" "task_curl" ) }}
env:
- name: "JARVIS_TASKRUN_NAMESPACE"
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: "JARVIS_TASKRUN_NAME"
valueFrom:
fieldRef:
fieldPath: metadata.labels['tekton.dev/taskRun']
volumeMounts: volumeMounts:
- name: gerrit-netrc - name: gerrit-netrc
mountPath: /run/jarvis/gerrit-netrc mountPath: /run/jarvis/gerrit-netrc
@@ -42,7 +36,7 @@ spec:
{ {
"checker_uuid": "$(params.checkerUUID)", "checker_uuid": "$(params.checkerUUID)",
"state": "SUCCESSFUL", "state": "SUCCESSFUL",
"url": "http://{{ .Values.params.tekton.dashboard.host }}/#/namespaces/${JARVIS_TASKRUN_NAMESPACE}/taskruns/${JARVIS_TASKRUN_NAME}", "url": "https://{{ .Values.params.grafana.dashboard.host }}/d/{{ .Values.params.grafana.dashboard.uid }}/{{ .Values.params.grafana.dashboard.title }}?orgId={{ .Values.params.grafana.dashboard.orgid }}&var-namespace=$(params.pipelineRunNamespace)&var-tekton_dev_pipeline=$(params.pipelineName)&var-tekton_dev_pipelineRun=$(params.pipelineRunName)&var-tekton_dev_taskRun=All",
"message": "Jarvis has successfully processed the run for change #$(params.changeNumber) ps #$(params.patchSetNumber) to the $(params.project) repo" "message": "Jarvis has successfully processed the run for change #$(params.changeNumber) ps #$(params.patchSetNumber) to the $(params.project) repo"
} }
EOF EOF

6
charts/jarvis-system/templates/TriggerBinding-createResult.yaml
View File

@@ -16,6 +16,12 @@ spec:
value: $(body.pipelineRun.spec.params[?(@.name=='patchSetNumber')].value) value: $(body.pipelineRun.spec.params[?(@.name=='patchSetNumber')].value)
- name: checkerUUID - name: checkerUUID
value: $(body.pipelineRun.spec.params[?(@.name=='checkerUUID')].value) value: $(body.pipelineRun.spec.params[?(@.name=='checkerUUID')].value)
- name: pipelineName
value: $(body.pipelineRun.spec.pipelineRef.name)
- name: pipelineRunName
value: $(body.pipelineRun.metadata.name)
- name: pipelineRunNamespace
value: $(body.pipelineRun.metadata.namespace)
... ...
{{- end -}} {{- end -}}
{{- include "helpers.template.overlay" ( dict "Global" $ "template_definition" "TriggerBinding-createResult" ) }} {{- include "helpers.template.overlay" ( dict "Global" $ "template_definition" "TriggerBinding-createResult" ) }}

9
charts/jarvis-system/templates/TriggerTemplate-createFailure.yaml
View File

@@ -11,6 +11,9 @@ spec:
- name: changeNumber - name: changeNumber
- name: patchSetNumber - name: patchSetNumber
- name: checkerUUID - name: checkerUUID
- name: pipelineName
- name: pipelineRunName
- name: pipelineRunNamespace
resourcetemplates: resourcetemplates:
- apiVersion: tekton.dev/v1beta1 - apiVersion: tekton.dev/v1beta1
kind: PipelineRun kind: PipelineRun
@@ -30,6 +33,12 @@ spec:
value: $(tt.params.patchSetNumber) value: $(tt.params.patchSetNumber)
- name: checkerUUID - name: checkerUUID
value: $(tt.params.checkerUUID) value: $(tt.params.checkerUUID)
- name: pipelineName
value: $(tt.params.pipelineName)
- name: pipelineRunName
value: $(tt.params.pipelineRunName)
- name: pipelineRunNamespace
value: $(tt.params.pipelineRunNamespace)
... ...
{{- end -}} {{- end -}}
{{- include "helpers.template.overlay" ( dict "Global" $ "template_definition" "TriggerTemplate-createFailure" ) }} {{- include "helpers.template.overlay" ( dict "Global" $ "template_definition" "TriggerTemplate-createFailure" ) }}

9
charts/jarvis-system/templates/TriggerTemplate-createSuccess.yaml
View File

@@ -11,6 +11,9 @@ spec:
- name: changeNumber - name: changeNumber
- name: patchSetNumber - name: patchSetNumber
- name: checkerUUID - name: checkerUUID
- name: pipelineName
- name: pipelineRunName
- name: pipelineRunNamespace
resourcetemplates: resourcetemplates:
- apiVersion: tekton.dev/v1beta1 - apiVersion: tekton.dev/v1beta1
kind: PipelineRun kind: PipelineRun
@@ -30,6 +33,12 @@ spec:
value: $(tt.params.patchSetNumber) value: $(tt.params.patchSetNumber)
- name: checkerUUID - name: checkerUUID
value: $(tt.params.checkerUUID) value: $(tt.params.checkerUUID)
- name: pipelineName
value: $(tt.params.pipelineName)
- name: pipelineRunName
value: $(tt.params.pipelineRunName)
- name: pipelineRunNamespace
value: $(tt.params.pipelineRunNamespace)
... ...
{{- end -}} {{- end -}}
{{- include "helpers.template.overlay" ( dict "Global" $ "template_definition" "TriggerTemplate-createSuccess" ) }} {{- include "helpers.template.overlay" ( dict "Global" $ "template_definition" "TriggerTemplate-createSuccess" ) }}

8
charts/jarvis-system/values.yaml
View File

@@ -40,4 +40,10 @@ params:
cert_manager: true cert_manager: true
issuer: issuer:
name: jarvis-ca-issuer name: jarvis-ca-issuer
kind: ClusterIssuer kind: ClusterIssuer
grafana:
dashboard:
host: grafana.jarvis.local
title: loki-pipeline-logs-dashboard
uid: lokiPipelineDash
orgid: 1

4
charts/loki/values_overrides/default.yaml
View File

@@ -767,8 +767,8 @@ loki-stack:
] ]
}, },
"timezone": "", "timezone": "",
"title": "Tekton Logs Dashboard", "title": "Loki Pipeline Logs Dashboard",
"uid": "tektonDash", "uid": "lokiPipelineDash",
"variables": { "variables": {
"list": [] "list": []
}, },