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

feat: thanos sidecar #1661

Closed
wants to merge 36 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
4593fba
feat: add thanos sidecar to store metrics in OBJ
srodenhuis Jul 26, 2024
d957dfc
fix: pipe
srodenhuis Jul 26, 2024
48284c3
fix: add thanos query comp and store
srodenhuis Jul 27, 2024
bc354a4
fix: obj key
srodenhuis Jul 27, 2024
75fd524
fix: fixtures
srodenhuis Jul 27, 2024
389d548
fix: add netpols
srodenhuis Jul 29, 2024
94f637a
Merge branch 'main' into sr-feat-thanos-sidecar
srodenhuis Aug 20, 2024
0f99474
Merge branch 'main' into sr-feat-thanos-sidecar
srodenhuis Aug 20, 2024
78c93d7
Update settings.yaml
srodenhuis Aug 20, 2024
9ee8250
fix: default ds
srodenhuis Aug 21, 2024
424c0c0
fix: team dashboards
srodenhuis Aug 21, 2024
8e0de38
fix: service entry
srodenhuis Aug 22, 2024
ce7064c
fix: obj secret
srodenhuis Aug 22, 2024
9183583
fix: query netpol
srodenhuis Aug 22, 2024
6cfa5f4
fix: rep label
srodenhuis Aug 22, 2024
0be3bc0
fix: rm e label
srodenhuis Aug 22, 2024
8e77d54
fix: stores
srodenhuis Aug 22, 2024
dc9931c
fix: rm stgw
srodenhuis Aug 22, 2024
84bf3bf
fix: rm stgw 2
srodenhuis Aug 22, 2024
92ecf97
fix: ex admin store
srodenhuis Aug 22, 2024
ae55fb1
fix: team no query
srodenhuis Aug 26, 2024
9ac4a3a
fix: p res and op role
srodenhuis Aug 26, 2024
1345ccb
fix: res default ds team
srodenhuis Aug 26, 2024
4df39ef
Merge branch 'main' into sr-feat-thanos-sidecar
srodenhuis Aug 27, 2024
0f3981b
fix: add thanos dashboards
srodenhuis Aug 27, 2024
d60d178
fix: add annotation
srodenhuis Aug 28, 2024
064f106
fix: move annotation
srodenhuis Aug 28, 2024
61ba3da
fix: move annotation 2
srodenhuis Aug 28, 2024
e08792b
fix: rm anno
srodenhuis Aug 28, 2024
fb32b01
Merge branch 'main' into sr-feat-thanos-sidecar
srodenhuis Sep 20, 2024
4b80021
fix: merge con 2
srodenhuis Sep 20, 2024
edc6738
fix: obj config th
srodenhuis Sep 20, 2024
6f45438
fix: rm team
srodenhuis Sep 20, 2024
6f0ef5d
fix: add matchers
srodenhuis Sep 20, 2024
22356b0
fix: thanos def
srodenhuis Sep 20, 2024
360e867
fix: schema
srodenhuis Sep 20, 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
12 changes: 12 additions & 0 deletions apps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,18 @@ appsInfo:
dependencies: Prometheus, Grafana, Minio (if no external Object Storage is used), Otel
about: Grafana Tempo is an open source, easy-to-use and high-scale distributed tracing backend. Tempo is cost-efficient, requiring only object storage to operate, and is deeply integrated with Grafana, Prometheus, and Loki.
integration: APL installs and configures Tempo based on best-practices defaults. By default storage is configured to use the tempo bucket of the local Minio instance. For each team a Grafana agent is installed and configured to enable writes to the Tempo cluster.
thanos:
title: Thanos
appVersion: 0.35.1
repo: https://github.com/thanos-io/thanos
maintainers: Thanos
relatedLinks:
- https://otomi.io/docs/apps/thanos
- https://thanos.io
license: Apache 2.0
dependencies: Prometheus, Grafana, Minio (if no external Object Storage is used)
about: Thanos is a tool to set up a Highly Available Prometheus with long-term storage capabilities.
integration: APL installs and configures Thanos using sidecars ans leverages the central object storage configuration.
trivy:
title: Trivy Operator
appVersion: 0.16.4
Expand Down
16 changes: 8 additions & 8 deletions charts/grafana-dashboards/k8s-teams/deployment.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"datasource": {
"type": "grafana",
"uid": "-- Grafana --"
},
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
Expand All @@ -12,7 +15,6 @@
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"id": 13,
Expand All @@ -28,7 +30,9 @@
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"datasource": "$datasource",
"datasource": {
"type": "prometheus"
},
"editable": false,
"format": "none",
"gauge": {
Expand Down Expand Up @@ -725,10 +729,6 @@
"templating": {
"list": [
{
"current": {
"text": "Prometheus-platform",
"value": "Prometheus-platform"
},
"hide": 0,
"includeAll": false,
"label": null,
Expand All @@ -737,7 +737,7 @@
"options": [],
"query": "prometheus",
"refresh": 1,
"regex": "",
"regex": "/^default/",
"skipUrlSync": false,
"type": "datasource"
},
Expand Down
6 changes: 1 addition & 5 deletions charts/grafana-dashboards/k8s-teams/pods.json
Original file line number Diff line number Diff line change
Expand Up @@ -440,17 +440,13 @@
"templating": {
"list": [
{
"current": {
"text": "Prometheus-platform",
"value": "Prometheus-platform"
},
"hide": 0,
"label": null,
"name": "datasource",
"options": [],
"query": "prometheus",
"refresh": 1,
"regex": "",
"regex": "/^default/",
"type": "datasource"
},
{
Expand Down
45 changes: 9 additions & 36 deletions charts/grafana-dashboards/k8s-teams/team-status.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@
"panels": [
{
"collapsed": false,
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"datasource": "$datasource",
"gridPos": {
"h": 1,
"w": 24,
Expand All @@ -44,10 +41,7 @@
"panels": [],
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"datasource": "$datasource",
"refId": "A"
}
],
Expand Down Expand Up @@ -725,10 +719,7 @@
},
{
"collapsed": false,
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"datasource": "$datasource",
"gridPos": {
"h": 1,
"w": 24,
Expand All @@ -739,10 +730,7 @@
"panels": [],
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"datasource": "$datasource",
"refId": "A"
}
],
Expand Down Expand Up @@ -1238,11 +1226,6 @@
"templating": {
"list": [
{
"current": {
"selected": false,
"text": "Prometheus-platform",
"value": "Prometheus-platform"
},
"hide": 0,
"includeAll": false,
"multi": false,
Expand All @@ -1251,21 +1234,14 @@
"query": "prometheus",
"queryValue": "",
"refresh": 1,
"regex": "",
"regex": "/^default/",
"skipUrlSync": false,
"type": "datasource"
},
{
"allValue": ".*",
"current": {
"selected": false,
"text": "All",
"value": "$__all"
},
"datasource": {
"type": "prometheus",
"uid": "$datasource"
},
"current": {},
"datasource": "$datasource",
"definition": "label_values(kube_node_info, cluster)",
"hide": 2,
"includeAll": true,
Expand All @@ -1277,7 +1253,7 @@
"refId": "StandardVariableQuery"
},
"refresh": 2,
"regex": "/(.*team\\-titan.*)/",
"regex": "/(.*team\\-#TEAM#.*)/",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": "",
Expand All @@ -1296,10 +1272,7 @@
"$__all"
]
},
"datasource": {
"type": "prometheus",
"uid": "$datasource"
},
"datasource": "$datasource",
"definition": "label_values(kube_pod_info{cluster=~\"$cluster\"}, node)",
"hide": 2,
"includeAll": true,
Expand Down
Loading