Merge branch 'main' into sample-count-and-bytes

grafana · Jun 3, 2024 · 7942e57 · 7942e57
2 parents 6ed195e + 8084259
commit 7942e57
Show file tree

Hide file tree

Showing 59 changed files with 465 additions and 323 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,4 +1,4 @@
 {
   ".": "3.0.0",
-  "operator": "0.6.0"
+  "operator": "0.6.1"
 }
diff --git a/docs/sources/reference/loki-http-api.md b/docs/sources/reference/loki-http-api.md
@@ -627,6 +627,7 @@ It accepts the following query parameters in the URL:
 - `start`: The start time for the query as a nanosecond Unix epoch. Defaults to 6 hours ago.
 - `end`: The end time for the query as a nanosecond Unix epoch. Defaults to now.
 - `since`: A `duration` used to calculate `start` relative to `end`. If `end` is in the future, `start` is calculated as this duration before now. Any value specified for `start` supersedes this parameter.
+- `query`: A set of log stream selector that selects the streams to match and return label names. Example: `{"app": "myapp", "environment": "dev"}`
 
 In microservices mode, `/loki/api/v1/labels` is exposed by the querier.
 

diff --git a/examples/README.md b/examples/README.md
@@ -8,7 +8,7 @@ You can use [Grafana Cloud](https://grafana.com/products/cloud/features/#cloud-l
 
 ## Getting started with Loki
 
-Configuration files in the `getting-started` directory are used by the [Loki getting started guide](https://grafana.com/docs/loki/latest/getting-started/).
+Configuration files in the `getting-started` directory are used by the [Loki getting started guide](https://grafana.com/docs/loki/latest/get-started/).
 
 ## Sending logs from Heroku to Loki
 

diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md
@@ -1,5 +1,22 @@
 ## Main
 
+## [0.6.1](https://github.com/grafana/loki/compare/operator/v0.6.0...operator/v0.6.1) (2024-06-03)
+
+
+### Features
+
+* prepare 3.0.0 release candidate ([#12348](https://github.com/grafana/loki/issues/12348)) ([664e569](https://github.com/grafana/loki/commit/664e569e14ef55a79cd77bdb49e9ffbe0c55bc37))
+
+
+### Bug Fixes
+
+* **operator:** Bump golang builder to 1.21.9 ([#12503](https://github.com/grafana/loki/issues/12503)) ([f680ee0](https://github.com/grafana/loki/commit/f680ee0453d1b7d315774591293927b988bca223))
+* **operator:** Configure Loki to use virtual-host-style URLs for S3 AWS endpoints ([#12469](https://github.com/grafana/loki/issues/12469)) ([0084262](https://github.com/grafana/loki/commit/0084262269f4e2cb94d04e0cc0d40e9666177f06))
+* **operator:** Improve validation of provided S3 storage configuration ([#12181](https://github.com/grafana/loki/issues/12181)) ([f9350d6](https://github.com/grafana/loki/commit/f9350d6415d45c3cc2f9c0b4f7cd6f8f219907f2))
+* **operator:** Use a minimum value for replay memory ceiling ([#13066](https://github.com/grafana/loki/issues/13066)) ([4f3ed77](https://github.com/grafana/loki/commit/4f3ed77cb92c2ffd605743237e609c28f7841728))
+* update to build image 0.33.2, fixes bug with promtail windows DNS resolution ([#12732](https://github.com/grafana/loki/issues/12732)) ([759f42d](https://github.com/grafana/loki/commit/759f42dd50bb4896f5e568691ef32245bb8fb25a))
+* updated all dockerfiles go1.22 ([#12708](https://github.com/grafana/loki/issues/12708)) ([71a8f2c](https://github.com/grafana/loki/commit/71a8f2c2b11b419bd8c0af1f859671e5d8730448))
+
 ## 0.6.0 (2024-03-19)
 
 - [12228](https://github.com/grafana/loki/pull/12228) **xperimental**: Restructure LokiStack metrics

diff --git a/operator/Makefile b/operator/Makefile
@@ -21,7 +21,7 @@ LOKI_OPERATOR_NS ?= kubernetes-operators
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 0.6.0
+VERSION ?= 0.6.1
 CHANNELS ?= "alpha"
 DEFAULT_CHANNEL ?= "alpha"
 

diff --git a/...penshift/manifests/loki-operator-controller-manager-metrics-reader_v1_serviceaccount.yaml b/...penshift/manifests/loki-operator-controller-manager-metrics-reader_v1_serviceaccount.yaml
@@ -3,9 +3,9 @@ kind: ServiceAccount
 metadata:
   creationTimestamp: null
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: loki-operator-controller-manager-metrics-reader
diff --git a/...nity-openshift/manifests/loki-operator-controller-manager-metrics-service_v1_service.yaml b/...nity-openshift/manifests/loki-operator-controller-manager-metrics-service_v1_service.yaml
@@ -6,11 +6,11 @@ metadata:
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: metrics
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: loki-operator-controller-manager-metrics-service
 spec:
   ports:

diff --git a/...mmunity-openshift/manifests/loki-operator-controller-manager-metrics-token_v1_secret.yaml b/...mmunity-openshift/manifests/loki-operator-controller-manager-metrics-token_v1_secret.yaml
@@ -4,10 +4,10 @@ metadata:
   annotations:
     kubernetes.io/service-account.name: loki-operator-controller-manager-metrics-reader
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: loki-operator-controller-manager-metrics-token
 type: kubernetes.io/service-account-token
diff --git a/...ator-controller-manager-read-metrics_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml b/...ator-controller-manager-read-metrics_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml
@@ -3,11 +3,11 @@ kind: ClusterRoleBinding
 metadata:
   creationTimestamp: null
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: loki-operator-controller-manager-read-metrics
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/operator/bundle/community-openshift/manifests/loki-operator-manager-config_v1_configmap.yaml b/operator/bundle/community-openshift/manifests/loki-operator-manager-config_v1_configmap.yaml
@@ -60,9 +60,9 @@ data:
 kind: ConfigMap
 metadata:
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: loki-operator-manager-config
diff --git a/...hift/manifests/loki-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml b/...hift/manifests/loki-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
@@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
     name: loki-operator
   name: loki-operator-metrics-monitor
 spec:

diff --git a/...hift/manifests/loki-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml b/...hift/manifests/loki-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
@@ -3,11 +3,11 @@ kind: ClusterRole
 metadata:
   creationTimestamp: null
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: loki-operator-metrics-reader
 rules:
 - nonResourceURLs:

diff --git a/...unity-openshift/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_role.yaml b/...unity-openshift/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_role.yaml
@@ -6,11 +6,11 @@ metadata:
     include.release.openshift.io/single-node-developer: "true"
   creationTimestamp: null
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: loki-operator-prometheus
 rules:
 - apiGroups:

diff --git a/...penshift/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_rolebinding.yaml b/...penshift/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_rolebinding.yaml
@@ -6,11 +6,11 @@ metadata:
     include.release.openshift.io/single-node-developer: "true"
   creationTimestamp: null
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: loki-operator-prometheus
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/operator/bundle/community-openshift/manifests/loki-operator-webhook-service_v1_service.yaml b/operator/bundle/community-openshift/manifests/loki-operator-webhook-service_v1_service.yaml
@@ -3,11 +3,11 @@ kind: Service
 metadata:
   creationTimestamp: null
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: loki-operator-webhook-service
 spec:
   ports:

diff --git a/operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml b/operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml
@@ -149,8 +149,8 @@ metadata:
     capabilities: Full Lifecycle
     categories: OpenShift Optional, Logging & Tracing
     certified: "false"
-    containerImage: docker.io/grafana/loki-operator:0.6.0
-    createdAt: "2024-05-03T11:49:48Z"
+    containerImage: docker.io/grafana/loki-operator:0.6.1
+    createdAt: "2024-06-03T10:01:23Z"
     description: The Community Loki Operator provides Kubernetes native deployment
       and management of Loki and related logging components.
     features.operators.openshift.io/disconnected: "true"
@@ -167,7 +167,7 @@ metadata:
   labels:
     operatorframework.io/arch.amd64: supported
     operatorframework.io/arch.arm64: supported
-  name: loki-operator.v0.6.0
+  name: loki-operator.v0.6.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -1681,11 +1681,11 @@ spec:
         serviceAccountName: loki-operator-controller-manager
       deployments:
       - label:
-          app.kubernetes.io/instance: loki-operator-v0.6.0
+          app.kubernetes.io/instance: loki-operator-v0.6.1
           app.kubernetes.io/managed-by: operator-lifecycle-manager
           app.kubernetes.io/name: loki-operator
           app.kubernetes.io/part-of: loki-operator
-          app.kubernetes.io/version: 0.6.0
+          app.kubernetes.io/version: 0.6.1
           control-plane: controller-manager
         name: loki-operator-controller-manager
         spec:
@@ -1719,7 +1719,7 @@ spec:
                   value: quay.io/observatorium/api:latest
                 - name: RELATED_IMAGE_OPA
                   value: quay.io/observatorium/opa-openshift:latest
-                image: docker.io/grafana/loki-operator:0.6.0
+                image: docker.io/grafana/loki-operator:0.6.1
                 imagePullPolicy: IfNotPresent
                 livenessProbe:
                   httpGet:
@@ -1844,8 +1844,8 @@ spec:
     name: gateway
   - image: quay.io/observatorium/opa-openshift:latest
     name: opa
-  replaces: loki-operator.v0.5.0
-  version: 0.6.0
+  replaces: loki-operator.v0.6.0
+  version: 0.6.1
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

diff --git a/operator/bundle/community-openshift/manifests/loki.grafana.com_alertingrules.yaml b/operator/bundle/community-openshift/manifests/loki.grafana.com_alertingrules.yaml
@@ -5,11 +5,11 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: alertingrules.loki.grafana.com
 spec:
   conversion:

diff --git a/operator/bundle/community-openshift/manifests/loki.grafana.com_lokistacks.yaml b/operator/bundle/community-openshift/manifests/loki.grafana.com_lokistacks.yaml
@@ -5,11 +5,11 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: lokistacks.loki.grafana.com
 spec:
   conversion:

diff --git a/operator/bundle/community-openshift/manifests/loki.grafana.com_recordingrules.yaml b/operator/bundle/community-openshift/manifests/loki.grafana.com_recordingrules.yaml
@@ -5,11 +5,11 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: recordingrules.loki.grafana.com
 spec:
   conversion:

diff --git a/operator/bundle/community-openshift/manifests/loki.grafana.com_rulerconfigs.yaml b/operator/bundle/community-openshift/manifests/loki.grafana.com_rulerconfigs.yaml
@@ -5,11 +5,11 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: rulerconfigs.loki.grafana.com
 spec:
   conversion:

diff --git a/...ommunity/manifests/loki-operator-controller-manager-metrics-reader_v1_serviceaccount.yaml b/...ommunity/manifests/loki-operator-controller-manager-metrics-reader_v1_serviceaccount.yaml
@@ -3,9 +3,9 @@ kind: ServiceAccount
 metadata:
   creationTimestamp: null
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: loki-operator-controller-manager-metrics-reader
diff --git a/...ndle/community/manifests/loki-operator-controller-manager-metrics-service_v1_service.yaml b/...ndle/community/manifests/loki-operator-controller-manager-metrics-service_v1_service.yaml
@@ -4,11 +4,11 @@ metadata:
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: metrics
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: loki-operator-controller-manager-metrics-service
 spec:
   ports:

diff --git a/...ator-controller-manager-read-metrics_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml b/...ator-controller-manager-read-metrics_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml
@@ -3,11 +3,11 @@ kind: ClusterRoleBinding
 metadata:
   creationTimestamp: null
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: loki-operator-controller-manager-read-metrics
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/operator/bundle/community/manifests/loki-operator-manager-config_v1_configmap.yaml b/operator/bundle/community/manifests/loki-operator-manager-config_v1_configmap.yaml
@@ -24,9 +24,9 @@ data:
 kind: ConfigMap
 metadata:
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: loki-operator-manager-config
diff --git a/...nity/manifests/loki-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml b/...nity/manifests/loki-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
@@ -3,11 +3,11 @@ kind: ClusterRole
 metadata:
   creationTimestamp: null
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: loki-operator-metrics-reader
 rules:
 - nonResourceURLs:

diff --git a/...undle/community/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_role.yaml b/...undle/community/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_role.yaml
@@ -6,11 +6,11 @@ metadata:
     include.release.openshift.io/single-node-developer: "true"
   creationTimestamp: null
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: loki-operator-prometheus
 rules:
 - apiGroups:

diff --git a/...ommunity/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_rolebinding.yaml b/...ommunity/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_rolebinding.yaml
@@ -6,11 +6,11 @@ metadata:
     include.release.openshift.io/single-node-developer: "true"
   creationTimestamp: null
   labels:
-    app.kubernetes.io/instance: loki-operator-v0.6.0
+    app.kubernetes.io/instance: loki-operator-v0.6.1
     app.kubernetes.io/managed-by: operator-lifecycle-manager
     app.kubernetes.io/name: loki-operator
     app.kubernetes.io/part-of: loki-operator
-    app.kubernetes.io/version: 0.6.0
+    app.kubernetes.io/version: 0.6.1
   name: loki-operator-prometheus
 roleRef:
   apiGroup: rbac.authorization.k8s.io