Compare commits

..

17 Commits

Author SHA1 Message Date
Edward Welch
58b438cdb5 update metrics port to look for metrics in the port name vs excluding ports
add some more log lines
2024-10-24 15:06:30 +00:00
J Stickler
c4af598b75 Merge pull request #147 from W0n9/main
Fix typo in loki-reads.json
2024-07-18 09:21:40 -04:00
TsungWing Wong
c78fe2d9fa Fix typo in loki-reads.json
TSBD -> TSDB
2024-07-17 13:38:58 +08:00
J Stickler
bae6e28b51 Merge pull request #146 from Vinaum8/patch-1
Update installation.md
2024-06-24 14:51:00 -04:00
Vinícius Fernandes
8f38e9508f Update installation.md
Update line 94, grafana:true to grafana : true. =P
2024-06-21 15:51:18 -03:00
Michel Hollands
de8a87dea1 Merge pull request #140 from grafana/chore/update-dependencies
[dependency] Update the subcharts
2024-06-03 08:43:45 +01:00
MichelHollands
48fad9f387 Update dependencies 2024-06-03 07:02:54 +00:00
Michel Hollands
4ec5f08646 Merge pull request #131 from grafana/add_loki_team_to_prs
Add loki-squad as PR reviewers
2024-05-31 15:21:35 +01:00
Michel Hollands
a1b66f0cd4 Merge pull request #138 from grafana/chore/update-dependencies
[dependency] Update the subcharts
2024-05-31 15:20:40 +01:00
MichelHollands
34bbe47d75 Update dependencies 2024-05-31 13:57:47 +00:00
Michel Hollands
0ef850e96c Add permissions
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
2024-05-31 14:56:32 +01:00
Michel Hollands
c91a819e77 Add secret step
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
2024-05-31 14:53:22 +01:00
Michel Hollands
71462a9f93 Use other token
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
2024-05-31 14:49:41 +01:00
Michel Hollands
c5f1daf8f0 Use team-reviewers
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
2024-05-31 14:36:05 +01:00
Michel Hollands
952c3e85d9 Use @
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
2024-05-31 14:29:24 +01:00
Michel Hollands
f6b72897cd Use other form
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
2024-05-31 14:06:06 +01:00
Michel Hollands
8b6314fde3 Add loki-squad as PR reviewers
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
2024-05-31 14:03:07 +01:00
19 changed files with 96 additions and 190 deletions

View File

@@ -19,6 +19,9 @@ jobs:
updateVersions:
name: Update the subcharts
runs-on: "ubuntu-latest"
permissions:
contents: write
id-token: write
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -66,6 +69,20 @@ jobs:
echo "changed=true" >> "${GITHUB_OUTPUT}"
fi
- id: get-secrets
uses: grafana/shared-workflows/actions/get-vault-secrets@main
with:
# Secrets placed in the ci/repo/grafana/<repo>/<path> path in Vault
repo_secrets: |
APP_ID=github-app:app-id
PRIVATE_KEY=github-app:private-key
- uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ env.APP_ID }}
private-key: ${{ env.PRIVATE_KEY }}
- name: Create pull request
if: steps.update-loki.outputs.changed == 'true' || steps.update-grafana-alloy.outputs.changed == 'true' || steps.update-mimir-distributed.outputs.changed == 'true' || steps.update-tempo-distributed.outputs.changed == 'true' || steps.update-minio.outputs.changed == 'true'
uses: peter-evans/create-pull-request@v5
@@ -79,10 +96,15 @@ jobs:
labels: dependencies
branch: chore/update-dependencies
delete-branch: true
team-reviewers: "@grafana/loki-squad"
token: ${{ steps.app-token.outputs.token }}
updateGrafana:
name: Update the Grafana version
runs-on: "ubuntu-latest"
permissions:
contents: write
id-token: write
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -98,6 +120,20 @@ jobs:
echo "changed=true" >> "${GITHUB_OUTPUT}"
fi
- id: get-secrets
uses: grafana/shared-workflows/actions/get-vault-secrets@main
with:
# Secrets placed in the ci/repo/grafana/<repo>/<path> path in Vault
repo_secrets: |
APP_ID=github-app:app-id
PRIVATE_KEY=github-app:private-key
- uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ env.APP_ID }}
private-key: ${{ env.PRIVATE_KEY }}
- name: Create pull request
if: steps.update-grafana.outputs.changed == 'true'
uses: peter-evans/create-pull-request@v5
@@ -111,3 +147,5 @@ jobs:
labels: dependencies
branch: chore/update-minio
delete-branch: true
team-reviewers: "@grafana/loki-squad"
token: ${{ steps.app-token.outputs.token }}

View File

@@ -20,48 +20,48 @@ jobs:
- name: Lint Yaml
run: make helm-lint
call-test:
name: Test Helm Chart
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
# call-test:
# name: Test Helm Chart
# runs-on: ubuntu-latest
# steps:
# - name: Checkout
# uses: actions/checkout@v4
# with:
# fetch-depth: 0
- name: Set up Helm
uses: azure/setup-helm@v3
with:
version: v3.14.0
# - name: Set up Helm
# uses: azure/setup-helm@v3
# with:
# version: v3.8.2
# Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and
# yamllint (https://github.com/adrienverge/yamllint) which require Python
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9
# # Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and
# # yamllint (https://github.com/adrienverge/yamllint) which require Python
# - name: Set up Python
# uses: actions/setup-python@v4
# with:
# python-version: 3.9
- name: Set up chart-testing
uses: helm/chart-testing-action@v2
# - name: Set up chart-testing
# uses: helm/chart-testing-action@v2
- name: Run chart-testing (list-changed)
id: list-changed
run: |
changed=$(ct list-changed --config "${CT_CONFIGFILE}")
if [[ -n "$changed" ]]; then
echo "changed=true" >> $GITHUB_OUTPUT
fi
# - name: Run chart-testing (list-changed)
# id: list-changed
# run: |
# changed=$(ct list-changed --config "${CT_CONFIGFILE}")
# if [[ -n "$changed" ]]; then
# echo "changed=true" >> $GITHUB_OUTPUT
# fi
- name: Run chart-testing (lint)
run: ct lint --config "${CT_CONFIGFILE}" --check-version-increment=false
# - name: Run chart-testing (lint)
# run: ct lint --config "${CT_CONFIGFILE}" --check-version-increment=false
- name: Create kind cluster
uses: helm/kind-action@v1
if: steps.list-changed.outputs.changed == 'true'
with:
config: "${{ github.workspace }}/.github/configs/cluster-config.yaml"
# - name: Create kind cluster
# uses: helm/kind-action@v1
# if: steps.list-changed.outputs.changed == 'true'
# with:
# config: "${{ github.workspace }}/.github/configs/cluster-config.yaml"
- name: Run chart-testing (install)
run: |
changed=$(ct list-changed --config "${CT_CONFIGFILE}")
ct install --config "${CT_CONFIGFILE}"
# - name: Run chart-testing (install)
# run: |
# changed=$(ct list-changed --config "${CT_CONFIGFILE}")
# ct install --config "${CT_CONFIGFILE}"

View File

@@ -1,18 +1,18 @@
dependencies:
- name: loki
repository: https://grafana.github.io/helm-charts
version: 6.5.2
version: 6.6.2
- name: alloy
repository: https://grafana.github.io/helm-charts
version: 0.3.0
version: 0.3.2
- name: mimir-distributed
repository: https://grafana.github.io/helm-charts
version: 5.3.0
- name: tempo-distributed
repository: https://grafana.github.io/helm-charts
version: 1.9.9
version: 1.10.0
- name: minio
repository: https://charts.min.io
version: 5.2.0
digest: sha256:0eaa504de24724505fa4fff5169cd86628465ec366c253392c4ed24f15902b6b
generated: "2024-05-22T07:02:54.054326052Z"
digest: sha256:f62b04092f6e7e89e6a427b586e4c0cbfcd54ddbd411846770ee684cf86f822a
generated: "2024-06-03T07:02:47.330637227Z"

View File

@@ -22,18 +22,18 @@ appVersion: "0.0.1"
dependencies:
- name: loki
repository: https://grafana.github.io/helm-charts
version: 6.5.2
version: 6.6.2
condition: local.logs.enabled
- name: alloy
repository: https://grafana.github.io/helm-charts
version: 0.3.0
version: 0.3.2
- name: mimir-distributed
repository: https://grafana.github.io/helm-charts
version: 5.3.0
condition: local.metrics.enabled
- name: tempo-distributed
repository: https://grafana.github.io/helm-charts
version: 1.9.9
version: 1.10.0
condition: local.traces.enabled
- name: minio
repository: https://charts.min.io

Binary file not shown.

Binary file not shown.

View File

@@ -1,116 +0,0 @@
namespacesToMonitor:
- loki
local:
grafana:
enabled: true
logs:
enabled: true
metrics:
enabled: true
traces:
enabled: true
minio:
enabled: true
createSecret: false
cloud:
logs:
enabled: false
secret: logs
metrics:
enabled: false
secret: metrics
traces:
enabled: false
secret: traces
grafana:
ingress:
hosts:
- host: monitoring.example.com
paths:
- path: /
pathType: Prefix
minio:
existingSecret: ""
rootUser: "abcdefghi"
rootPassword: "defghijkl"
loki:
deploymentMode: SingleBinary
singleBinary:
replicas: 1
resources:
limits:
cpu: 3
memory: 4Gi
requests:
cpu: 2
memory: 2Gi
extraEnv:
# Keep a little bit lower than memory limits
- name: GOMEMLIMIT
value: 3750MiB
chunksCache:
# default is 500MB, with limited memory keep this smaller
writebackSizeLimit: 10MB
# Zero out replica counts of other deployment modes
backend:
replicas: 0
read:
replicas: 0
write:
replicas: 0
ingester:
replicas: 0
querier:
replicas: 0
queryFrontend:
replicas: 0
queryScheduler:
replicas: 0
distributor:
replicas: 0
compactor:
replicas: 0
indexGateway:
replicas: 0
bloomCompactor:
replicas: 0
bloomGateway:
replicas: 0
mimir-distributed:
minio:
enabled: false
global:
extraEnvFrom:
- secretRef:
name: "meta-minio"
tempo-distributed:
distributor:
extraEnvFrom:
- secretRef:
name: "meta-minio"
ingester:
extraEnvFrom:
- secretRef:
name: "meta-minio"
compactor:
extraEnvFrom:
- secretRef:
name: "meta-minio"
querier:
extraEnvFrom:
- secretRef:
name: "meta-minio"
queryFrontend:
extraEnvFrom:
- secretRef:
name: "meta-minio"

View File

@@ -6,5 +6,6 @@ chart-dirs:
chart-repos:
- grafana=https://grafana.github.io/helm-charts
- minio=https://charts.min.io
helm-extra-args: --timeout 1200s
check-version-increment: false
validate-maintainers: false

View File

@@ -2449,7 +2449,7 @@
"repeatIteration": null,
"repeatRowId": null,
"showTitle": true,
"title": "TSBD Index",
"title": "TSDB Index",
"titleSize": "h6"
},
{
@@ -2897,4 +2897,4 @@
"title": "Loki / Reads",
"uid": "reads",
"version": 0
}
}

View File

@@ -120,9 +120,9 @@ data:
replacement = "{{- .Values.clusterLabelValue -}}"
}
rule {
source_labels = ["__meta_kubernetes_pod_container_port_number"]
action = "drop"
regex = "9095"
source_labels = ["__meta_kubernetes_pod_container_port_name"]
action = "keep"
regex = ".*metrics.*"
}
}

View File

@@ -1,13 +0,0 @@
{{- if .Values.local.minio.createSecret }}
apiVersion: v1
kind: Secret
metadata:
name: minio
namespace: {{ $.Release.Namespace }}
annotations:
"helm.sh/hook": pre-install
"helm.sh/hook-weight": "-5"
data:
rootUser: dmFsdWUtMg0KDQo=
rootPassword: dmFsdWUtMg0KDQo=
{{- end }}

View File

@@ -51,11 +51,7 @@ spec:
protocol: TCP
envFrom:
- secretRef:
{{- if .Values.local.minio.enabled }}
name: {{ $.Release.Namespace }}-minio
{{- else }}
name: minio
{{- end }}
readinessProbe:
failureThreshold: 3
httpGet:

View File

@@ -41,4 +41,3 @@
{{- if empty .Values.metrics.retain -}}
{{- fail "All metrics will be collected, please specify some in metrics.retain" -}}
{{- end -}}

View File

@@ -26,8 +26,7 @@ local:
traces:
enabled: false
minio:
enabled: false # This should be set to true if any of the previous is enabled
createSecret: false # This is used for testing, do not use in production
enabled: false # This should be set to true if any of the previous is enabled
grafana:
version: 10.4.2
# Gateway ingress configuration
@@ -53,23 +52,25 @@ grafana:
# port:
# number: TODO
# -- TLS configuration for the gateway ingress. Hosts passed through the `tpl` function to allow templating
# tls:
#tls:
# - secretName: grafana-tls
# hosts:
# - monitoring.example.com
logs:
# Adding regexes here will add a stage.replace block for logs. For more information see
# https://grafana.com/docs/agent/latest/flow/reference/components/loki.process/#stagereplace-block
piiRegexes: null # This example replaces the word after password with *****
piiRegexes: null # This example replaces the word after password with *****
# - expression: "password (\\\\S+)"
# source: "" # Empty uses the log message
# replace: "*****""
# The lines matching these will be kept in Loki
retain:
# This shows the queries
- executing query
- caller=metrics.go
# This shows any errors
- level=error
- level=warn
# Log lines for delete requests
- delete request for user added
- Started processing delete request

View File

@@ -91,7 +91,7 @@
local:
grafana:
enabled:true
enabled: true
logs:
enabled: true
metrics: