From 215f37cfa3050e3ef753fe5eff482babfad79215 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Tue, 28 Feb 2023 11:25:57 -0800 Subject: [PATCH] [CI/CD] Update yaml file `./production/helm/loki/values.yaml` (+1 other) (#8655) **Here is a summary of the updates contained in this PR:** *** Update attribute `$.enterprise.version` in yaml file `./production/helm/loki/values.yaml` to the following value: `v1.6.2` *** Bump version of Helm Chart Add changelog entry to `./production/helm/loki/CHANGELOG.md` Re-generate docs Co-authored-by: Dylan Guedes --- docs/sources/installation/helm/reference.md | 4 +- production/helm/loki/CHANGELOG.md | 5 ++ production/helm/loki/Chart.yaml | 3 +- production/helm/loki/README.md | 2 +- production/helm/loki/values.yaml | 68 ++------------------- 5 files changed, 13 insertions(+), 69 deletions(-) diff --git a/docs/sources/installation/helm/reference.md b/docs/sources/installation/helm/reference.md index 0ea5c410048e0..e69f562768d54 100644 --- a/docs/sources/installation/helm/reference.md +++ b/docs/sources/installation/helm/reference.md @@ -706,7 +706,7 @@ false string 
-"v1.6.1"
+"v1.6.2"
@@ -805,7 +805,7 @@ null string Uses the specified users from the `loki.tenants` list to create the htpasswd file if `loki.tenants` is not set, the `gateway.basicAuth.username` and `gateway.basicAuth.password` are used The value is templated using `tpl`. Override this to use a custom htpasswd, e.g. in case the default causes high CPU load. 
-"{{ if .Values.loki.tenants }}\n  {{- range $t := .Values.loki.tenants }}\n{{ htpasswd (required \"All tenants must have a 'name' set\" $t.name) (required \"All tenants must have a 'password' set\" $t.password) }}\n  {{- end }}\n{{ else }} {{ htpasswd (required \"'gateway.basicAuth.username' is required\" .Values.gateway.basicAuth.username) (required \"'gateway.basicAuth.password' is required\" .Values.gateway.basicAuth.password) }} {{ end }}"
+"{{ if .Values.loki.tenants }}\n\n  {{- range $t := .Values.loki.tenants }}\n{{ htpasswd (required \"All tenants must have a 'name' set\" $t.name) (required \"All tenants must have a 'password' set\" $t.password) }}\n\n  {{- end }}\n{{ else }} {{ htpasswd (required \"'gateway.basicAuth.username' is required\" .Values.gateway.basicAuth.username) (required \"'gateway.basicAuth.password' is required\" .Values.gateway.basicAuth.password) }} {{ end }}"
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index b788327b4af3f..31e9c10f9ca45 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,6 +13,11 @@ Entries should include a reference to the pull request that introduced the chang [//]: # ( : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.) +## 4.8.0 + +- [CHANGE] Changed version of Grafana Enterprise Logs to v1.6.2 + + ## 4.7 - [CHANGE] **BREAKING** Rename `gel-license.jwt` property of secret `gel-secrets` to `license.jwt` on enterprise-logs chart. diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 56f81d647735e..2a3e6227f108a 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -1,10 +1,9 @@ ---- apiVersion: v2 name: loki description: Helm chart for Grafana Loki in simple, scalable mode type: application appVersion: 2.7.3 -version: 4.7.0 +version: 4.8.0 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md index 8c1c5f4c904c7..335a0f3ba5c10 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 4.7.0](https://img.shields.io/badge/Version-4.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.3](https://img.shields.io/badge/AppVersion-2.7.3-informational?style=flat-square) +![Version: 4.8.0](https://img.shields.io/badge/Version-4.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.3](https://img.shields.io/badge/AppVersion-2.7.3-informational?style=flat-square) Helm chart for Grafana Loki in simple, scalable mode diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index fa0246621637c..6dadd31670f0c 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -1,4 +1,3 @@ ---- global: image: # -- Overrides the Docker registry globally for all images @@ -11,16 +10,12 @@ global: dnsService: "kube-dns" # -- configures DNS service namespace dnsNamespace: "kube-system" - # -- Overrides the chart's name nameOverride: null - # -- Overrides the chart's computed fullname fullnameOverride: null - # -- Image pull secrets for Docker images imagePullSecrets: [] - kubectlImage: # -- The Docker registry registry: docker.io @@ -30,7 +25,6 @@ kubectlImage: tag: null # -- Docker image pull policy pullPolicy: IfNotPresent - loki: # Configures the readiness probe for all of the Loki pods readinessProbe: @@ -199,17 +193,14 @@ loki: querier: {{- tpl (. | toYaml) $ | nindent 4 }} {{- end }} - # Should authentication be enabled auth_enabled: true # -- Tenants list to be created on nginx htpasswd file, with name and password keys tenants: [] - # -- Check https://grafana.com/docs/loki/latest/configuration/#server for more info on the server configuration. server: http_listen_port: 3100 grpc_listen_port: 9095 - # -- Limits config limits_config: enforce_metric_name: false @@ -217,16 +208,13 @@ loki: reject_old_samples_max_age: 168h max_cache_freshness_per_query: 10m split_queries_by_interval: 15m - # -- Provides a reloadable runtime configuration file for some specific configuration runtimeConfig: {} - # -- Check https://grafana.com/docs/loki/latest/configuration/#common_config for more info on how to provide a common configuration commonConfig: path_prefix: /var/loki replication_factor: 3 compactor_address: '{{ include "loki.compactorAddress" . }}' - # -- Storage config. Providing this will automatically populate all necessary storage configs in the templated config. storage: bucketNames: @@ -256,7 +244,6 @@ loki: filesystem: chunks_directory: /var/loki/chunks rules_directory: /var/loki/rules - # -- Configure memcached as an external cache for chunk and results cache. Disabled by default # must enable and specify a host for each cache you would like to use. memcached: @@ -272,49 +259,36 @@ loki: service: "memcached-client" timeout: "500ms" default_validity: "12h" - # -- Check https://grafana.com/docs/loki/latest/configuration/#schema_config for more info on how to configure schemas schemaConfig: {} - # -- Check https://grafana.com/docs/loki/latest/configuration/#ruler for more info on configuring ruler rulerConfig: {} - # -- Structured loki configuration, takes precedence over `loki.config`, `loki.schemaConfig`, `loki.storageConfig` structuredConfig: {} - # -- Additional query scheduler config query_scheduler: {} - # -- Additional storage config storage_config: hedging: at: "250ms" max_per_second: 20 up_to: 3 - # -- Optional compactor configuration compactor: {} - # -- Optional analytics configuration analytics: {} - # -- Optional querier configuration querier: {} - # -- Optional ingester configuration ingester: {} - enterprise: # Enable enterprise features, license must be provided enabled: false - # Default verion of GEL to deploy - version: v1.6.1 - + version: v1.6.2 # -- Optional name of the GEL cluster, otherwise will use .Release.Name # The cluster name must match what is in your GEL license cluster_name: null - # -- Grafana Enterprise Logs license # In order to use Grafana Enterprise Logs features, you will need to provide # the contents of your Grafana Enterprise Logs license, either by providing the @@ -323,21 +297,16 @@ enterprise: # To set the license contents, use the flag `--set-file 'license.contents=./license.jwt'` license: contents: "NOTAVALIDLICENSE" - # -- Set to true when providing an external license useExternalLicense: false - # -- Name of external license secret to use externalLicenseName: null - # -- Name of the external config secret to use externalConfigName: "" - # -- If enabled, the correct admin_client storage will be configured. If disabled while running enterprise, # make sure auth is set to `type: trust`, or that `auth_enabled` is set to `false`. adminApi: enabled: true - # enterprise specific sections of the config.yaml file config: | {{- if .Values.enterprise.adminApi.enabled }} @@ -354,7 +323,6 @@ enterprise: cluster_name: {{ include "loki.clusterName" . }} license: path: /etc/loki/license/license.jwt - image: # -- The Docker registry registry: docker.io @@ -366,17 +334,14 @@ enterprise: tag: main-96f32b9f # -- Docker image pull policy pullPolicy: IfNotPresent - adminToken: # -- Alternative name for admin token secret, needed by tokengen and provisioner jobs secret: null # -- Additional namespace to also create the token in. Useful if your Grafana instance # is in a different namespace additionalNamespaces: [] - # -- Alternative name of the secret to store token for the canary canarySecret: null - # -- Configuration for `tokengen` target tokengen: # -- Whether the job should be part of the deployment @@ -407,7 +372,6 @@ enterprise: extraEnvFrom: [] # -- The name of the PriorityClass for tokengen Pods priorityClassName: "" - # -- Configuration for `provisioner` target provisioner: # -- Whether the job should be part of the deployment @@ -447,7 +411,6 @@ enterprise: pullPolicy: IfNotPresent # -- Volume mounts to add to the provisioner pods extraVolumeMounts: [] - # -- Options that may be necessary when performing a migration from another helm chart migrate: # -- When migrating from a distributed chart like loki-distributed or enterprise-logs @@ -457,7 +420,6 @@ migrate: # -- If migrating from a distributed service, provide the distributed deployment's # memberlist service DNS so the new deployment can join it's ring. memberlistService: "" - serviceAccount: # -- Specifies whether a ServiceAccount should be created create: true @@ -472,14 +434,12 @@ serviceAccount: labels: {} # -- Set this toggle to false to opt out of automounting API credentials for the service account automountServiceAccountToken: true - # RBAC configuration rbac: # -- If pspEnabled true, a PodSecurityPolicy is created for K8s that use psp. pspEnabled: false # -- For OpenShift set pspEnabled to 'false' and sccEnabled to 'true' to use the SecurityContextConstraints. sccEnabled: false - # -- Section for configuring optional Helm test test: enabled: true @@ -501,7 +461,6 @@ test: tag: null # -- Docker image pull policy pullPolicy: IfNotPresent - # Monitoring section determines which monitoring features to enable monitoring: # Dashboards for monitoring Loki @@ -515,7 +474,6 @@ monitoring: # -- Labels for the dashboards ConfigMap labels: grafana_dashboard: "1" - # Recording rules for monitoring Loki, required for some dashboards rules: # -- If enabled, create PrometheusRule resource with Loki recording rules @@ -538,7 +496,6 @@ monitoring: # expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job, route) # - record: node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate # expr: sum(rate(container_cpu_usage_seconds_total[1m])) by (node, namespace, pod, container) - # ServiceMonitor configuration serviceMonitor: # -- If enabled, ServiceMonitor resources for Prometheus Operator are created @@ -572,7 +529,6 @@ monitoring: labels: {} # -- If defined a MetricsInstance will be created to remote write metrics. remoteWrite: null - # Self monitoring determines whether Loki should scrape it's own logs. # This feature currently relies on the Grafana Agent Operator being installed, # which is installed by default using the grafana-agent-operator sub-chart. @@ -580,7 +536,6 @@ monitoring: # scrape configs to scrape it's own logs with the labels expected by the included dashboards. selfMonitoring: enabled: true - # -- Tenant to use for self monitoring tenant: # -- Name of the tenant @@ -588,7 +543,6 @@ monitoring: # -- Namespace to create additional tenant token secret in. Useful if your Grafana instance # is in a separate namespace. Token will still be created in the canary namespace. secretNamespace: "{{ .Release.Namespace }}" - # Grafana Agent configuration grafanaAgent: # -- Controls whether to install the Grafana Agent Operator and its CRDs. @@ -601,7 +555,6 @@ monitoring: labels: {} # -- Enable the config read api on port 8080 of the agent enableConfigReadAPI: false - # PodLogs configuration podLogs: # -- PodLogs annotations @@ -611,7 +564,6 @@ monitoring: # -- PodLogs relabel configs to apply to samples before scraping # https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig relabelings: [] - # LogsInstance configuration logsInstance: # -- LogsInstance annotations @@ -620,7 +572,6 @@ monitoring: labels: {} # -- Additional clients for remote write clients: null - # The Loki canary pushes logs to and queries from this loki installation to test # that it's working correctly lokiCanary: @@ -649,7 +600,6 @@ monitoring: tag: null # -- Docker image pull policy pullPolicy: IfNotPresent - # Configuration for the write pod(s) write: # -- Number of replicas for the write @@ -719,7 +669,6 @@ write: storageClass: null # -- Selector for persistent disk selector: null - # Configuration for the table-manager tableManager: # -- Specifies whether the table-manager should be enabled @@ -777,7 +726,6 @@ tableManager: nodeSelector: {} # -- Tolerations for table-manager pods tolerations: [] - # Configuration for the read pod(s) read: # -- Number of replicas for the read @@ -858,7 +806,6 @@ read: storageClass: null # -- Selector for persistent disk selector: null - # Configuration for the backend pod(s) backend: # -- Number of replicas for the backend @@ -926,7 +873,6 @@ backend: storageClass: null # -- Selector for persistent disk selector: null - # Configuration for the single binary node(s) singleBinary: # -- Number of replicas for the single binary @@ -1003,7 +949,6 @@ singleBinary: storageClass: null # -- Selector for persistent disk selector: null - # Use either this ingress or the gateway, but not both at once. # If you enable this, make sure to disable the gateway. # You'll need to supply authn configuration for your ingress controller. @@ -1038,7 +983,6 @@ ingress: - /loki/api/v1/rules - /prometheus/api/v1/rules - /prometheus/api/v1/alerts - hosts: - loki.example.com tls: [] @@ -1050,7 +994,6 @@ ingress: memberlist: service: publishNotReadyAddresses: false - # Configuration for the gateway gateway: # -- Specifies whether the gateway should be enabled @@ -1181,12 +1124,12 @@ gateway: # high CPU load. htpasswd: >- {{ if .Values.loki.tenants }} + {{- range $t := .Values.loki.tenants }} {{ htpasswd (required "All tenants must have a 'name' set" $t.name) (required "All tenants must have a 'password' set" $t.password) }} + {{- end }} - {{ else }} - {{ htpasswd (required "'gateway.basicAuth.username' is required" .Values.gateway.basicAuth.username) (required "'gateway.basicAuth.password' is required" .Values.gateway.basicAuth.password) }} - {{ end }} + {{ else }} {{ htpasswd (required "'gateway.basicAuth.username' is required" .Values.gateway.basicAuth.username) (required "'gateway.basicAuth.password' is required" .Values.gateway.basicAuth.password) }} {{ end }} # -- Existing basic auth secret to use. Must contain '.htpasswd' existingSecret: null # Configures the readiness probe for the gateway @@ -1257,10 +1200,8 @@ networkPolicy: podSelector: {} # -- Specifies the namespace the discovery Pods are running in namespaceSelector: {} - tracing: jaegerAgentHost: "" - # ------------------------------------- # Configuration for `minio` child chart # ------------------------------------- @@ -1289,7 +1230,6 @@ minio: requests: cpu: 100m memory: 128Mi - # Create extra manifests via values. Would be passed through `tpl` for templating extraObjects: [] # - apiVersion: v1