Skip to content

Commit 9c6a884

Browse files
trevorwhitneytrevorwhitney
committed
Squashed commit of the following:
commit 35585db Merge: 1822b88 47f0236 Author: Trevor Whitney <[email protected]> Date: Mon Jun 3 11:43:12 2024 -0600 Merge branch 'main' into sample-count-and-bytes commit 1822b88 Author: Trevor Whitney <[email protected]> Date: Mon Jun 3 11:42:52 2024 -0600 fix: formatting commit 47f0236 Author: Dylan Guedes <[email protected]> Date: Mon Jun 3 14:41:55 2024 -0300 feat: Introduce `index audit` to `lokitool` (#13008) Adds a new `index audit` command to the `lokitool` cmd. The new `index audit` validates that all chunks required by a given index are available at the object storage. This is useful to validate if you're missing data after a backfill or when migrating data from one Loki instance to another. See `pkg/tool/audit/README.md` for usage instructions. commit 71507a2 Author: Kaviraj Kanagaraj <[email protected]> Date: Mon Jun 3 18:18:39 2024 +0200 feat(canary): Add test to check query results with and without cache. (#13104) Signed-off-by: Kaviraj <[email protected]> commit 7942e57 Merge: 6ed195e 8084259 Author: Trevor Whitney <[email protected]> Date: Mon Jun 3 09:27:58 2024 -0600 Merge branch 'main' into sample-count-and-bytes commit 6ed195e Author: Trevor Whitney <[email protected]> Date: Mon Jun 3 09:25:37 2024 -0600 fix: nanosecond values in test with non-decimal seconds value commit 8084259 Author: Yuri Kotov <[email protected]> Date: Mon Jun 3 21:30:25 2024 +0700 feat: API: Expose optional label matcher for label names API (#11982) Co-authored-by: Cyril Tovena <[email protected]> commit 09faea8 Author: Yoshitaka Fujii <[email protected]> Date: Mon Jun 3 21:16:10 2024 +0900 docs: Fix link in examples (#13094) Co-authored-by: J Stickler <[email protected]> commit c8cc0fb Author: Grot (@grafanabot) <[email protected]> Date: Mon Jun 3 12:39:26 2024 +0100 chore( operator): community release 0.6.1 (#12593) commit fbd2739 Author: Joao Marcal <[email protected]> Date: Mon Jun 3 12:15:47 2024 +0200 chore(operator): prepare community release v0.6.1 (#13105) commit 4f3ed77 Author: Robert Jacob <[email protected]> Date: Mon Jun 3 11:02:15 2024 +0200 fix(operator): Use a minimum value for replay memory ceiling (#13066) commit cbf9fc0 Author: Trevor Whitney <[email protected]> Date: Fri May 31 16:46:39 2024 -0600 docs: update docs commit 29febb7 Author: Trevor Whitney <[email protected]> Date: Fri May 31 16:42:12 2024 -0600 chore: make format commit 87f7282 Author: Trevor Whitney <[email protected]> Date: Fri May 31 16:34:48 2024 -0600 chore: clean up linting commit abb31a8 Merge: 33ead60 00d3c7a Author: Trevor Whitney <[email protected]> Date: Fri May 31 16:10:58 2024 -0600 Merge branch 'main' into sample-count-and-bytes commit 33ead60 Author: Trevor Whitney <[email protected]> Date: Fri May 31 16:03:04 2024 -0600 feat: hook up samples endpoint commit eb84303 Author: Trevor Whitney <[email protected]> Date: Fri May 31 13:07:49 2024 -0600 chore: a bit of cleanup commit 6dd77ae Author: Trevor Whitney <[email protected]> Date: Fri May 31 12:56:05 2024 -0600 feat: refactor metric samples to be it's own endpoint commit 2587657 Author: Trevor Whitney <[email protected]> Date: Fri May 24 17:35:15 2024 -0600 fix: grouping commit b897fc5 Author: Trevor Whitney <[email protected]> Date: Fri May 24 13:36:00 2024 -0600 fix: ring proxy methods on pattern ring_client commit 0bfd0ad Merge: 68aa188 efdae3d Author: Trevor Whitney <[email protected]> Date: Thu May 23 17:04:32 2024 -0600 Merge branch 'main' into sample-count-and-bytes commit 68aa188 Author: Trevor Whitney <[email protected]> Date: Thu May 23 17:03:32 2024 -0600 feat: guard aggregation behavior behind a feature flag commit f0d6a92 Author: Trevor Whitney <[email protected]> Date: Thu May 23 14:03:32 2024 -0600 feat: reject filter queries to /patterns endpoint commit dc620e7 Author: Trevor Whitney <[email protected]> Date: Wed May 8 14:08:44 2024 -0600 feat: collect and serve pre-agg bytes and count * pre-aggregate bytes and count per stream in the pattern ingester * serve bytes_over_time and count_over_time queries from the patterns endpoint
1 parent 00d3c7a commit 9c6a884

File tree

148 files changed

+23499
-681
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+23499
-681
lines changed

‎.release-please-manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
".": "3.0.0",
3-
"operator": "0.6.0"
3+
"operator": "0.6.1"
44
}

‎clients/cmd/promtail/promtail-local-config.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ scrape_configs:
1616
labels:
1717
job: varlogs
1818
__path__: /var/log/*log
19+
stream: stdout

‎cmd/loki-canary/main.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ func main() {
7979
metricTestQueryRange := flag.Duration("metric-test-range", 24*time.Hour, "The range value [24h] used in the metric test instant-query."+
8080
" Note: this value is truncated to the running time of the canary until this value is reached")
8181

82+
cacheTestInterval := flag.Duration("cache-test-interval", 15*time.Minute, "The interval the cache test query should be run")
83+
cacheTestQueryRange := flag.Duration("cache-test-range", 24*time.Hour, "The range value [24h] used in the cache test instant-query.")
84+
cacheTestQueryNow := flag.Duration("cache-test-now", 1*time.Hour, "duration how far back from current time the execution time (--now) should be set for running this query in the cache test instant-query.")
85+
8286
spotCheckInterval := flag.Duration("spot-check-interval", 15*time.Minute, "Interval that a single result will be kept from sent entries and spot-checked against Loki, "+
8387
"e.g. 15min default one entry every 15 min will be saved and then queried again every 15min until spot-check-max is reached")
8488
spotCheckMax := flag.Duration("spot-check-max", 4*time.Hour, "How far back to check a spot check entry before dropping it")
@@ -189,7 +193,7 @@ func main() {
189193
_, _ = fmt.Fprintf(os.Stderr, "Unable to create reader for Loki querier, check config: %s", err)
190194
os.Exit(1)
191195
}
192-
c.comparator = comparator.NewComparator(os.Stderr, *wait, *maxWait, *pruneInterval, *spotCheckInterval, *spotCheckMax, *spotCheckQueryRate, *spotCheckWait, *metricTestInterval, *metricTestQueryRange, *interval, *buckets, sentChan, receivedChan, c.reader, true)
196+
c.comparator = comparator.NewComparator(os.Stderr, *wait, *maxWait, *pruneInterval, *spotCheckInterval, *spotCheckMax, *spotCheckQueryRate, *spotCheckWait, *metricTestInterval, *metricTestQueryRange, *cacheTestInterval, *cacheTestQueryRange, *cacheTestQueryNow, *interval, *buckets, sentChan, receivedChan, c.reader, true)
193197
}
194198

195199
startCanary()

‎cmd/loki/loki-local-config.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ schema_config:
3333
prefix: index_
3434
period: 24h
3535

36+
pattern_ingester:
37+
enabled: true
38+
metric_aggregation:
39+
enabled: true
40+
3641
ruler:
3742
alertmanager_url: http://localhost:9093
3843

‎cmd/lokitool/main.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ import (
1212
)
1313

1414
var (
15-
ruleCommand commands.RuleCommand
15+
ruleCommand commands.RuleCommand
16+
auditCommand commands.AuditCommand
1617
)
1718

1819
func main() {
1920
app := kingpin.New("lokitool", "A command-line tool to manage Loki.")
2021
ruleCommand.Register(app)
22+
auditCommand.Register(app)
2123

2224
app.Command("version", "Get the version of the lokitool CLI").Action(func(k *kingpin.ParseContext) error {
2325
fmt.Println(version.Print("loki"))

‎docs/sources/reference/loki-http-api.md

+1
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,7 @@ It accepts the following query parameters in the URL:
627627
- `start`: The start time for the query as a nanosecond Unix epoch. Defaults to 6 hours ago.
628628
- `end`: The end time for the query as a nanosecond Unix epoch. Defaults to now.
629629
- `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.
630+
- `query`: A set of log stream selector that selects the streams to match and return label names. Example: `{"app": "myapp", "environment": "dev"}`
630631

631632
In microservices mode, `/loki/api/v1/labels` is exposed by the querier.
632633

‎docs/sources/shared/configuration.md

+7
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,13 @@ pattern_ingester:
316316
# CLI flag: -pattern-ingester.flush-check-period
317317
[flush_check_period: <duration> | default = 30s]
318318

319+
# Configures the metric aggregation and storage behavior of the pattern
320+
# ingester.
321+
metric_aggregation:
322+
# Whether the pattern ingester metric aggregation is enabled.
323+
# CLI flag: -pattern-ingester.metric-aggregation.enabled
324+
[enabled: <boolean> | default = false]
325+
319326
# The index_gateway block configures the Loki index gateway server, responsible
320327
# for serving index queries without the need to constantly interact with the
321328
# object store.

‎examples/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ You can use [Grafana Cloud](https://grafana.com/products/cloud/features/#cloud-l
88

99
## Getting started with Loki
1010

11-
Configuration files in the `getting-started` directory are used by the [Loki getting started guide](https://grafana.com/docs/loki/latest/getting-started/).
11+
Configuration files in the `getting-started` directory are used by the [Loki getting started guide](https://grafana.com/docs/loki/latest/get-started/).
1212

1313
## Sending logs from Heroku to Loki
1414

‎go.mod

+3-1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ require (
134134
github.com/prometheus/alertmanager v0.27.0
135135
github.com/prometheus/common/sigv4 v0.1.0
136136
github.com/richardartoul/molecule v1.0.0
137+
github.com/schollz/progressbar/v3 v3.14.2
137138
github.com/shirou/gopsutil/v4 v4.24.0-alpha.1
138139
github.com/thanos-io/objstore v0.0.0-20230829152104-1b257a36f9a3
139140
github.com/willf/bloom v2.0.3+incompatible
@@ -153,6 +154,7 @@ require (
153154
github.com/go-ole/go-ole v1.2.6 // indirect
154155
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
155156
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
157+
github.com/rivo/uniseg v0.4.7 // indirect
156158
github.com/shoenig/go-m1cpu v0.1.6 // indirect
157159
github.com/tklauser/go-sysconf v0.3.12 // indirect
158160
github.com/tklauser/numcpus v0.6.1 // indirect
@@ -286,7 +288,7 @@ require (
286288
github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165 // indirect
287289
github.com/mailru/easyjson v0.7.7 // indirect
288290
github.com/mattn/go-colorable v0.1.13 // indirect
289-
github.com/mattn/go-isatty v0.0.19 // indirect
291+
github.com/mattn/go-isatty v0.0.20 // indirect
290292
github.com/miekg/dns v1.1.58 // indirect
291293
github.com/minio/md5-simd v1.1.2 // indirect
292294
github.com/minio/sha256-simd v1.0.1 // indirect

‎go.sum

+9-2
Original file line numberDiff line numberDiff line change
@@ -1259,6 +1259,7 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
12591259
github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
12601260
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
12611261
github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
1262+
github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw=
12621263
github.com/kardianos/service v1.0.0/go.mod h1:8CzDhVuCuugtsHyZoTvsOBuvonN/UDBvl0kH+BUxvbo=
12631264
github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
12641265
github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
@@ -1355,8 +1356,8 @@ github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOA
13551356
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
13561357
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
13571358
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
1358-
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
1359-
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
1359+
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
1360+
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
13601361
github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
13611362
github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
13621363
github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
@@ -1625,6 +1626,8 @@ github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qq
16251626
github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod h1:gRAiPF5C5Nd0eyyRdqIu9qTiFSoZzpTq727b5B8fkkU=
16261627
github.com/richardartoul/molecule v1.0.0 h1:+LFA9cT7fn8KF39zy4dhOnwcOwRoqKiBkPqKqya+8+U=
16271628
github.com/richardartoul/molecule v1.0.0/go.mod h1:uvX/8buq8uVeiZiFht+0lqSLBHF+uGV8BrTv8W/SIwk=
1629+
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
1630+
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
16281631
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
16291632
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
16301633
github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
@@ -1650,6 +1653,8 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh
16501653
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
16511654
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25 h1:/8rfZAdFfafRXOgz+ZpMZZWZ5pYggCY9t7e/BvjaBHM=
16521655
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
1656+
github.com/schollz/progressbar/v3 v3.14.2 h1:EducH6uNLIWsr560zSV1KrTeUb/wZGAHqyMFIEa99ks=
1657+
github.com/schollz/progressbar/v3 v3.14.2/go.mod h1:aQAZQnhF4JGFtRJiw/eobaXpsqpVQAftEQ+hLGXaRc4=
16531658
github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod h1:7zjs06qF79/FKAJpBvFx3P8Ww4UTIMAe+lpNXDHziac=
16541659
github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod h1:BeybITEsBEg6qbIiqJ6/Bqeq25bCLbL7YFmpaFfJDuM=
16551660
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
@@ -2257,6 +2262,7 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
22572262
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
22582263
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
22592264
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2265+
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
22602266
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
22612267
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
22622268
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
@@ -2266,6 +2272,7 @@ golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
22662272
golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
22672273
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
22682274
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
2275+
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
22692276
golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
22702277
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
22712278
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎operator/CHANGELOG.md

+17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
## Main
22

3+
## [0.6.1](https://github.com/grafana/loki/compare/operator/v0.6.0...operator/v0.6.1) (2024-06-03)
4+
5+
6+
### Features
7+
8+
* prepare 3.0.0 release candidate ([#12348](https://github.com/grafana/loki/issues/12348)) ([664e569](https://github.com/grafana/loki/commit/664e569e14ef55a79cd77bdb49e9ffbe0c55bc37))
9+
10+
11+
### Bug Fixes
12+
13+
* **operator:** Bump golang builder to 1.21.9 ([#12503](https://github.com/grafana/loki/issues/12503)) ([f680ee0](https://github.com/grafana/loki/commit/f680ee0453d1b7d315774591293927b988bca223))
14+
* **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))
15+
* **operator:** Improve validation of provided S3 storage configuration ([#12181](https://github.com/grafana/loki/issues/12181)) ([f9350d6](https://github.com/grafana/loki/commit/f9350d6415d45c3cc2f9c0b4f7cd6f8f219907f2))
16+
* **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))
17+
* 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))
18+
* updated all dockerfiles go1.22 ([#12708](https://github.com/grafana/loki/issues/12708)) ([71a8f2c](https://github.com/grafana/loki/commit/71a8f2c2b11b419bd8c0af1f859671e5d8730448))
19+
320
## 0.6.0 (2024-03-19)
421

522
- [12228](https://github.com/grafana/loki/pull/12228) **xperimental**: Restructure LokiStack metrics

‎operator/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LOKI_OPERATOR_NS ?= kubernetes-operators
2121
# To re-generate a bundle for another specific version without changing the standard setup, you can:
2222
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
2323
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
24-
VERSION ?= 0.6.0
24+
VERSION ?= 0.6.1
2525
CHANNELS ?= "alpha"
2626
DEFAULT_CHANNEL ?= "alpha"
2727

‎operator/bundle/community-openshift/manifests/loki-operator-controller-manager-metrics-reader_v1_serviceaccount.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ kind: ServiceAccount
33
metadata:
44
creationTimestamp: null
55
labels:
6-
app.kubernetes.io/instance: loki-operator-v0.6.0
6+
app.kubernetes.io/instance: loki-operator-v0.6.1
77
app.kubernetes.io/managed-by: operator-lifecycle-manager
88
app.kubernetes.io/name: loki-operator
99
app.kubernetes.io/part-of: loki-operator
10-
app.kubernetes.io/version: 0.6.0
10+
app.kubernetes.io/version: 0.6.1
1111
name: loki-operator-controller-manager-metrics-reader

‎operator/bundle/community-openshift/manifests/loki-operator-controller-manager-metrics-service_v1_service.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ metadata:
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/component: metrics
9-
app.kubernetes.io/instance: loki-operator-v0.6.0
9+
app.kubernetes.io/instance: loki-operator-v0.6.1
1010
app.kubernetes.io/managed-by: operator-lifecycle-manager
1111
app.kubernetes.io/name: loki-operator
1212
app.kubernetes.io/part-of: loki-operator
13-
app.kubernetes.io/version: 0.6.0
13+
app.kubernetes.io/version: 0.6.1
1414
name: loki-operator-controller-manager-metrics-service
1515
spec:
1616
ports:

‎operator/bundle/community-openshift/manifests/loki-operator-controller-manager-metrics-token_v1_secret.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ metadata:
44
annotations:
55
kubernetes.io/service-account.name: loki-operator-controller-manager-metrics-reader
66
labels:
7-
app.kubernetes.io/instance: loki-operator-v0.6.0
7+
app.kubernetes.io/instance: loki-operator-v0.6.1
88
app.kubernetes.io/managed-by: operator-lifecycle-manager
99
app.kubernetes.io/name: loki-operator
1010
app.kubernetes.io/part-of: loki-operator
11-
app.kubernetes.io/version: 0.6.0
11+
app.kubernetes.io/version: 0.6.1
1212
name: loki-operator-controller-manager-metrics-token
1313
type: kubernetes.io/service-account-token

‎operator/bundle/community-openshift/manifests/loki-operator-controller-manager-read-metrics_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ kind: ClusterRoleBinding
33
metadata:
44
creationTimestamp: null
55
labels:
6-
app.kubernetes.io/instance: loki-operator-v0.6.0
6+
app.kubernetes.io/instance: loki-operator-v0.6.1
77
app.kubernetes.io/managed-by: operator-lifecycle-manager
88
app.kubernetes.io/name: loki-operator
99
app.kubernetes.io/part-of: loki-operator
10-
app.kubernetes.io/version: 0.6.0
10+
app.kubernetes.io/version: 0.6.1
1111
name: loki-operator-controller-manager-read-metrics
1212
roleRef:
1313
apiGroup: rbac.authorization.k8s.io

‎operator/bundle/community-openshift/manifests/loki-operator-manager-config_v1_configmap.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ data:
6060
kind: ConfigMap
6161
metadata:
6262
labels:
63-
app.kubernetes.io/instance: loki-operator-v0.6.0
63+
app.kubernetes.io/instance: loki-operator-v0.6.1
6464
app.kubernetes.io/managed-by: operator-lifecycle-manager
6565
app.kubernetes.io/name: loki-operator
6666
app.kubernetes.io/part-of: loki-operator
67-
app.kubernetes.io/version: 0.6.0
67+
app.kubernetes.io/version: 0.6.1
6868
name: loki-operator-manager-config

‎operator/bundle/community-openshift/manifests/loki-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1
22
kind: ServiceMonitor
33
metadata:
44
labels:
5-
app.kubernetes.io/instance: loki-operator-v0.6.0
5+
app.kubernetes.io/instance: loki-operator-v0.6.1
66
app.kubernetes.io/managed-by: operator-lifecycle-manager
77
app.kubernetes.io/name: loki-operator
88
app.kubernetes.io/part-of: loki-operator
9-
app.kubernetes.io/version: 0.6.0
9+
app.kubernetes.io/version: 0.6.1
1010
name: loki-operator
1111
name: loki-operator-metrics-monitor
1212
spec:

‎operator/bundle/community-openshift/manifests/loki-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ kind: ClusterRole
33
metadata:
44
creationTimestamp: null
55
labels:
6-
app.kubernetes.io/instance: loki-operator-v0.6.0
6+
app.kubernetes.io/instance: loki-operator-v0.6.1
77
app.kubernetes.io/managed-by: operator-lifecycle-manager
88
app.kubernetes.io/name: loki-operator
99
app.kubernetes.io/part-of: loki-operator
10-
app.kubernetes.io/version: 0.6.0
10+
app.kubernetes.io/version: 0.6.1
1111
name: loki-operator-metrics-reader
1212
rules:
1313
- nonResourceURLs:

‎operator/bundle/community-openshift/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_role.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ metadata:
66
include.release.openshift.io/single-node-developer: "true"
77
creationTimestamp: null
88
labels:
9-
app.kubernetes.io/instance: loki-operator-v0.6.0
9+
app.kubernetes.io/instance: loki-operator-v0.6.1
1010
app.kubernetes.io/managed-by: operator-lifecycle-manager
1111
app.kubernetes.io/name: loki-operator
1212
app.kubernetes.io/part-of: loki-operator
13-
app.kubernetes.io/version: 0.6.0
13+
app.kubernetes.io/version: 0.6.1
1414
name: loki-operator-prometheus
1515
rules:
1616
- apiGroups:

‎operator/bundle/community-openshift/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_rolebinding.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ metadata:
66
include.release.openshift.io/single-node-developer: "true"
77
creationTimestamp: null
88
labels:
9-
app.kubernetes.io/instance: loki-operator-v0.6.0
9+
app.kubernetes.io/instance: loki-operator-v0.6.1
1010
app.kubernetes.io/managed-by: operator-lifecycle-manager
1111
app.kubernetes.io/name: loki-operator
1212
app.kubernetes.io/part-of: loki-operator
13-
app.kubernetes.io/version: 0.6.0
13+
app.kubernetes.io/version: 0.6.1
1414
name: loki-operator-prometheus
1515
roleRef:
1616
apiGroup: rbac.authorization.k8s.io

‎operator/bundle/community-openshift/manifests/loki-operator-webhook-service_v1_service.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ kind: Service
33
metadata:
44
creationTimestamp: null
55
labels:
6-
app.kubernetes.io/instance: loki-operator-v0.6.0
6+
app.kubernetes.io/instance: loki-operator-v0.6.1
77
app.kubernetes.io/managed-by: operator-lifecycle-manager
88
app.kubernetes.io/name: loki-operator
99
app.kubernetes.io/part-of: loki-operator
10-
app.kubernetes.io/version: 0.6.0
10+
app.kubernetes.io/version: 0.6.1
1111
name: loki-operator-webhook-service
1212
spec:
1313
ports:

‎operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ metadata:
149149
capabilities: Full Lifecycle
150150
categories: OpenShift Optional, Logging & Tracing
151151
certified: "false"
152-
containerImage: docker.io/grafana/loki-operator:0.6.0
153-
createdAt: "2024-05-03T11:49:48Z"
152+
containerImage: docker.io/grafana/loki-operator:0.6.1
153+
createdAt: "2024-06-03T10:01:23Z"
154154
description: The Community Loki Operator provides Kubernetes native deployment
155155
and management of Loki and related logging components.
156156
features.operators.openshift.io/disconnected: "true"
@@ -167,7 +167,7 @@ metadata:
167167
labels:
168168
operatorframework.io/arch.amd64: supported
169169
operatorframework.io/arch.arm64: supported
170-
name: loki-operator.v0.6.0
170+
name: loki-operator.v0.6.1
171171
namespace: placeholder
172172
spec:
173173
apiservicedefinitions: {}
@@ -1681,11 +1681,11 @@ spec:
16811681
serviceAccountName: loki-operator-controller-manager
16821682
deployments:
16831683
- label:
1684-
app.kubernetes.io/instance: loki-operator-v0.6.0
1684+
app.kubernetes.io/instance: loki-operator-v0.6.1
16851685
app.kubernetes.io/managed-by: operator-lifecycle-manager
16861686
app.kubernetes.io/name: loki-operator
16871687
app.kubernetes.io/part-of: loki-operator
1688-
app.kubernetes.io/version: 0.6.0
1688+
app.kubernetes.io/version: 0.6.1
16891689
control-plane: controller-manager
16901690
name: loki-operator-controller-manager
16911691
spec:
@@ -1719,7 +1719,7 @@ spec:
17191719
value: quay.io/observatorium/api:latest
17201720
- name: RELATED_IMAGE_OPA
17211721
value: quay.io/observatorium/opa-openshift:latest
1722-
image: docker.io/grafana/loki-operator:0.6.0
1722+
image: docker.io/grafana/loki-operator:0.6.1
17231723
imagePullPolicy: IfNotPresent
17241724
livenessProbe:
17251725
httpGet:
@@ -1844,8 +1844,8 @@ spec:
18441844
name: gateway
18451845
- image: quay.io/observatorium/opa-openshift:latest
18461846
name: opa
1847-
replaces: loki-operator.v0.5.0
1848-
version: 0.6.0
1847+
replaces: loki-operator.v0.6.0
1848+
version: 0.6.1
18491849
webhookdefinitions:
18501850
- admissionReviewVersions:
18511851
- v1

0 commit comments

Comments
 (0)