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

Helm: Remove graphite-web from graphite proxy configuration #5133

Merged
merged 6 commits into from
Jun 12, 2023
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
1 change: 1 addition & 0 deletions operations/helm/charts/mimir-distributed/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Entries should include a reference to the Pull Request that introduced the chang
## main / unreleased

* [CHANGE] Query-frontend: enable cardinality estimation via `frontend.query_sharding_target_series_per_shard` in the Mimir configuration for query sharding by default if `results-cache.enabled` is true. #5128
* [CHANGE] Remove `graphite-web` component from the graphite proxy. The `graphite-web` component had several configuration issues which meant it was failing to process requests. #5133
* [ENHANCEMENT] Set `nginx` and `gateway` Nginx read timeout (`proxy_read_timeout`) to 300 seconds (increase from default 60 seconds), so that it doesn't interfere with the querier's default 120 seconds timeout (`mimir.structuredConfig.querier.timeout`). #4924
* [ENHANCEMENT] Update nginx image to `nginxinc/nginx-unprivileged:1.24-alpine`. #5066
* [ENHANCEMENT] Update the `rollout-operator` subchart to `0.5.0`. #4930
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ADMIN_API_HOST="localhost"
TENANT="test-tenant"

echo "# Getting API TOKEN from tokengen job"
API_TOKEN=$(kubectl logs -f "job/${HELM_INSTALL_NAME}-mimir-tokengen" | grep Token | awk '{print $2}')
API_TOKEN=$(kubectl logs -f "job/${HELM_INSTALL_NAME}-tokengen" | grep Token | awk '{print $2}')
echo "Succesfully found token: ${API_TOKEN}"

echo "# Creating Test Tenant"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,28 @@ curl \
-H "Content-Type: application/json" \
--fail-with-body \
"${MIMIR_GATEWAY_HOST}:8080/graphite/tags"

echo ""
echo ""

echo "# Getting functions"
# this will return 400 when using values.yaml as graphite-web is not enabled there
curl \
-X GET \
-H "Authorization: Basic ${MIMIR_BASIC_AUTH}" \
-H "Content-Type: application/json" \
--fail-with-body \
"${MIMIR_GATEWAY_HOST}:8080/graphite/functions"

echo ""

echo "# Running query"
curl \
-X GET \
-H "Authorization: Basic ${MIMIR_BASIC_AUTH}" \
-H "Content-Type: application/json" \
--fail-with-body \
"${MIMIR_GATEWAY_HOST}:8080/graphite/render?target=seriesByTag(\"service=foo\")&from=-5m"

echo ""
echo ""
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,6 @@ Examples:
"gr-aggr-cache" "gr-aggr-cache"
"gr-metricname-cache" "gr-metricname-cache"
"graphite-querier" "graphite.querier"
"graphite-web" "graphite.web"
"graphite-write-proxy" "graphite.write_proxy"
"index-cache" "index-cache"
"ingester" "ingester"
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

59 changes: 1 addition & 58 deletions operations/helm/charts/mimir-distributed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -384,8 +384,7 @@ mimir:
querier:
remote_read:
query_address: http://{{ template "mimir.fullname" . }}-query-frontend.{{ .Release.Namespace }}.svc:{{ include "mimir.serverHttpListenPort" . }}/prometheus

graphite_fallback: http://{{ template "mimir.fullname" . }}-graphite-web.{{ .Release.Namespace}}.svc:{{ include "mimir.serverHttpListenPort" . }}
proxy_bad_requests: false

schemas:
default_storage_schemas_file: /etc/graphite-proxy/storage-schemas.conf
Expand Down Expand Up @@ -3236,62 +3235,6 @@ graphite:
extraVolumes: []
extraVolumeMounts: []

web:
replicas: 1

image:
repository: docker.io/raintank/graphite-mt
tag: 8-7ebde4c60-v2
pullPolicy: IfNotPresent

service:
annotations: {}
labels: {}

# -- Resources for graphite-web pods
resources:
requests:
cpu: 100m
memory: 512Mi
# -- The name of the PriorityClass for graphite-web pods
priorityClassName: null
# -- Labels for graphite-web pods
podLabels: {}
# -- Annotations for graphite-web pods
podAnnotations: {}
# -- Node selector for graphite-web pods
nodeSelector: {}
# -- Affinity for graphite-web pods
affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector:
matchExpressions:
- key: app.kubernetes.io/component
operator: In
values:
- graphite-web
topologyKey: 'kubernetes.io/hostname'

strategy:
type: RollingUpdate
# -- Grace period to allow the graphite-web to shutdown before it is killed
terminationGracePeriodSeconds: 30
# -- Tolerations for graphite-web pods
tolerations: []
# -- Pod Disruption Budget
podDisruptionBudget: {}

# -- SecurityContext override for graphite web pods
securityContext: {}

containerSecurityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
capabilities:
drop: [ALL]


# Graphite's aggregation cache. If you want to know more about it please check
# https://grafana.com/docs/enterprise-metrics/latest/graphite/graphite_querier/#aggregation-cache
gr-aggr-cache:
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@ data:
memcached:
addresses: dnssrvnoa+graphite-enabled-values-mimir-gr-aggr-cache.citestns.svc:11211
timeout: 1s
graphite_fallback: http://graphite-enabled-values-mimir-graphite-web.citestns.svc:8080
metric_name_cache:
memcached:
addresses: dnssrvnoa+graphite-enabled-values-mimir-gr-metricname-cache.citestns.svc:11211
timeout: 1s
proxy_bad_requests: false
remote_read:
query_address: http://graphite-enabled-values-mimir-query-frontend.citestns.svc:8080/prometheus
schemas:
Expand Down