Skip to content
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 .github/ISSUE_TEMPLATE/blank.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ body:
- loki.source.syslog
- loki.source.windowsevent
- loki.write
- mimir.alerts.kubernetes
- mimir.rules.kubernetes
- otelcol.auth.basic
- otelcol.auth.bearer
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ body:
- loki.source.syslog
- loki.source.windowsevent
- loki.write
- mimir.alerts.kubernetes
- mimir.rules.kubernetes
- otelcol.auth.basic
- otelcol.auth.bearer
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ body:
- loki.source.syslog
- loki.source.windowsevent
- loki.write
- mimir.alerts.kubernetes
- mimir.rules.kubernetes
- otelcol.auth.basic
- otelcol.auth.bearer
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ body:
- loki.source.syslog
- loki.source.windowsevent
- loki.write
- mimir.alerts.kubernetes
- mimir.rules.kubernetes
- otelcol.auth.basic
- otelcol.auth.bearer
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/proposal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ body:
- loki.source.syslog
- loki.source.windowsevent
- loki.write
- mimir.alerts.kubernetes
- mimir.rules.kubernetes
- otelcol.auth.basic
- otelcol.auth.bearer
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/integration-tests-k8s.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Integration Tests on Kubernetes
on:
push:
branches:
- main
pull_request:

permissions:
contents: read

jobs:
run_tests:
runs-on:
labels: github-hosted-ubuntu-x64-large
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version-file: go.mod
- name: Run tests
run: make integration-test-k8s
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ internal API changes are not present.
Main (unreleased)
-----------------

### Features

- A new `mimir.alerts.kubernetes` component which discovers `AlertmanagerConfig` Kubernetes resources and loads them into a Mimir instance. (@ptodev)

### Enhancements

- update promtail converter to use `file_match` block for `loki.source.file` instead of going through `local.file_match`. (@kalleep)
Expand Down
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ run-alloylint: alloylint
# more for packages that exclude tests via //go:build !race due to known race detection issues. The
# final command runs tests for syntax module.
test:
$(GO_ENV) go test $(GO_FLAGS) -race $(shell go list ./... | grep -v /integration-tests/)
$(GO_ENV) go test $(GO_FLAGS) -race $(shell go list ./... | grep -v -E '/integration-tests/|/integration-tests-k8s/')
$(GO_ENV) go test $(GO_FLAGS) ./internal/static/integrations/node_exporter
$(GO_ENV) cd ./syntax && go test -race ./...

Expand All @@ -180,6 +180,11 @@ test-pyroscope:
cd ./internal/component/pyroscope/util/internal/cmd/playground/ && \
$(GO_ENV) go build .

.PHONY: integration-test-k8s
integration-test-k8s: alloy-image
cd ./internal/cmd/integration-tests-k8s/ && \
$(GO_ENV) go test -timeout 10m ./...

#
# Targets for building binaries
#
Expand Down
Loading
Loading