Skip to content

Commit

Permalink
Merge branch 'master' into stage
Browse files Browse the repository at this point in the history
  • Loading branch information
@stehessel
stehessel committed Dec 12, 2023
2 parents a040264 + 4e0bbbd commit 7063480
Show file tree
Hide file tree
Showing 12 changed files with 12,064 additions and 2,771 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-go@v4
- uses: actions/setup-python@v5
- uses: actions/setup-go@v5
with:
go-version: ">=1.18.0"
- name: Install promtool
Expand Down
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ repos:
- id: end-of-file-fixer
- repo: local
hooks:
- id: make-generate
name: make generate
entry: ./scripts/run-make-generate.sh
language: system
pass_filenames: false
- id: grafana-lint
name: grafana lint
entry: ./scripts/lint-grafana.sh
Expand Down
68 changes: 42 additions & 26 deletions resources/grafana/generated/dashboards/rhacs-central-slo-configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ data:
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
"id": 7,
"id": 15,
"links": [],
"liveNow": false,
"panels": [
Expand All @@ -61,7 +61,7 @@ data:
"content": "## Definition\n\nThe availability of Central is defined as a combination of pod ready status and API error rate.\n\n`Availability SLI = Pod Ready SLI * Error Rate SLI`\n\nThe SLO target is 99% availability calculated over 28 day rolling intervals.",
"mode": "markdown"
},
"pluginVersion": "9.4.7",
"pluginVersion": "10.2.0",
"type": "text"
},
{
Expand All @@ -88,6 +88,7 @@ data:
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand All @@ -101,6 +102,7 @@ data:
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
Expand Down Expand Up @@ -460,6 +462,7 @@ data:
},
"id": 18,
"options": {
"cellHeight": "sm",
"footer": {
"countRows": false,
"enablePagination": true,
Expand All @@ -472,7 +475,7 @@ data:
"showHeader": true,
"sortBy": []
},
"pluginVersion": "9.4.7",
"pluginVersion": "10.2.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -640,7 +643,7 @@ data:
"uid": "PBFA97CFB590B2093"
},
"gridPos": {
"h": 2,
"h": 3,
"w": 23,
"x": 0,
"y": 32
Expand All @@ -652,10 +655,10 @@ data:
"showLineNumbers": false,
"showMiniMap": false
},
"content": "Select instances via the variables on top of the dashbord. If multiple Centrals are selected, the SLIs/SLOs are averaged.",
"content": "Select instances via the variables on top of the dashbord. If multiple Centrals are selected, the SLIs/SLOs are averaged.\n\nWe plot a proxy of the SLI based on the number of unavailability drops per hour (percentage gauges are exact). This renders better in Grafana for long ranges. Note that the actual down time may be shorter than is rendered. It might still be necessary to zoom in around burn rate spikes to get full resolution.",
"mode": "markdown"
},
"pluginVersion": "9.4.7",
"pluginVersion": "10.2.0",
"type": "text"
},
{
Expand Down Expand Up @@ -698,10 +701,12 @@ data:
"h": 8,
"w": 5,
"x": 0,
"y": 34
"y": 35
},
"id": 6,
"options": {
"minVizHeight": 75,
"minVizWidth": 75,
"orientation": "auto",
"reduceOptions": {
"calcs": [
Expand All @@ -713,7 +718,7 @@ data:
"showThresholdLabels": false,
"showThresholdMarkers": true
},
"pluginVersion": "9.4.7",
"pluginVersion": "10.2.0",
"targets": [
{
"datasource": {
Expand All @@ -735,13 +740,14 @@ data:
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
},
"description": "`Pod Ready SLI * Error Rate SLI`",
"description": "`Pod Ready SLI * Error Rate SLI`\n\nWe show a proxy of the SLI based on the number of unavailability drops because it renders better in Grafana.",
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand All @@ -755,6 +761,7 @@ data:
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
Expand Down Expand Up @@ -794,7 +801,7 @@ data:
"h": 8,
"w": 6,
"x": 5,
"y": 34
"y": 35
},
"id": 9,
"options": {
Expand All @@ -816,7 +823,7 @@ data:
"uid": "PBFA97CFB590B2093"
},
"editorMode": "code",
"expr": "avg(central:sli:availability{rhacs_instance_id=~\"$instance_id\"})",
"expr": "1 - clamp_max(avg(changes(central:sli:availability{namespace=~\"rhacs-$instance_id\"}[1h])), 1)",
"legendFormat": "{{label_name}}",
"range": true,
"refId": "A"
Expand All @@ -830,13 +837,14 @@ data:
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
},
"description": "`1` is at least one pod is in ready state. `0` otherwise.",
"description": "`1` is at least one pod is in ready state. `0` otherwise.\n\nWe show a proxy of the SLI based on the number of unavailability drops because it renders better in Grafana.",
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand All @@ -850,6 +858,7 @@ data:
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
Expand Down Expand Up @@ -889,7 +898,7 @@ data:
"h": 8,
"w": 6,
"x": 11,
"y": 34
"y": 35
},
"id": 13,
"options": {
Expand All @@ -911,8 +920,8 @@ data:
"uid": "PBFA97CFB590B2093"
},
"editorMode": "code",
"expr": "avg(central:sli:pod_ready{namespace=~\"rhacs-$instance_id\"})",
"legendFormat": "{{label_name}}",
"expr": "1 - clamp_max(avg(changes(central:sli:pod_ready{namespace=~\"rhacs-$instance_id\"}[1h])), 1)",
"legendFormat": "SLI",
"range": true,
"refId": "A"
}
Expand All @@ -925,13 +934,14 @@ data:
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
},
"description": "`1` if the combined error rate of gRPC and HTTP requests is `<35%`. `0` otherwise.\n\nA gRPC error is defined by a response with `grpc_code != OK`. An HTTP error is defined by a response with status code `5xx`.",
"description": "`1` if the combined error rate of gRPC and HTTP requests is `<35%`. `0` otherwise.\n\nA gRPC error is defined by a response with `grpc_code != OK`. An HTTP error is defined by a response with status code `5xx`.\n\nWe show a proxy of the SLI based on the number of unavailability drops because it renders better in Grafana.",
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand All @@ -945,6 +955,7 @@ data:
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
Expand Down Expand Up @@ -984,7 +995,7 @@ data:
"h": 8,
"w": 6,
"x": 17,
"y": 34
"y": 35
},
"id": 12,
"options": {
Expand All @@ -1006,7 +1017,7 @@ data:
"uid": "PBFA97CFB590B2093"
},
"editorMode": "code",
"expr": "avg(central:sli:error_rate{rhacs_instance_id=~\"$instance_id\"})",
"expr": "1 - clamp_max(avg(changes(central:sli:error_rate{namespace=~\"rhacs-$instance_id\"}[1h])), 1)",
"legendFormat": "{{label_name}}",
"range": true,
"refId": "A"
Expand Down Expand Up @@ -1060,10 +1071,12 @@ data:
"h": 8,
"w": 5,
"x": 0,
"y": 42
"y": 43
},
"id": 7,
"options": {
"minVizHeight": 75,
"minVizWidth": 75,
"orientation": "auto",
"reduceOptions": {
"calcs": [
Expand All @@ -1075,7 +1088,7 @@ data:
"showThresholdLabels": false,
"showThresholdMarkers": true
},
"pluginVersion": "9.4.7",
"pluginVersion": "10.2.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -1103,6 +1116,7 @@ data:
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand All @@ -1116,6 +1130,7 @@ data:
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
Expand Down Expand Up @@ -1154,7 +1169,7 @@ data:
"h": 8,
"w": 9,
"x": 5,
"y": 42
"y": 43
},
"id": 10,
"options": {
Expand Down Expand Up @@ -1196,6 +1211,7 @@ data:
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand All @@ -1209,6 +1225,7 @@ data:
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
Expand Down Expand Up @@ -1247,7 +1264,7 @@ data:
"h": 8,
"w": 9,
"x": 14,
"y": 42
"y": 43
},
"id": 14,
"options": {
Expand Down Expand Up @@ -1279,10 +1296,9 @@ data:
"type": "timeseries"
}
],
"refresh": "",
"refresh": false,
"revision": 1,
"schemaVersion": 37,
"style": "dark",
"schemaVersion": 38,
"tags": [
"rhacs"
],
Expand Down Expand Up @@ -1439,6 +1455,6 @@ data:
"timezone": "",
"title": "RHACS Dataplane - Central SLOs",
"uid": "vH7ntMs4k",
"version": 2,
"version": 1,
"weekStart": ""
}
Loading

0 comments on commit 7063480

Please sign in to comment.