Skip to content
This repository has been archived by the owner on Apr 2, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into add-temp-table-metrics
Browse files Browse the repository at this point in the history
  • Loading branch information
arajkumar authored Nov 14, 2022
2 parents 1664d74 + 84b6775 commit d8af20d
Show file tree
Hide file tree
Showing 19 changed files with 1,567 additions and 1,479 deletions.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ go.sum @timescale/o11y-applications
.github/workflows/mixin.yml @timescale/o11y-services

# Go packages
/pkg/api @antekresic @Harkishen-Singh
/pkg/migrations/ @timescale/o11y-data-platform
/pkg/migration-tool @timescale/o11y-applications
/pkg/pgmodel/querier @timescale/o11y-data-platform
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ jobs:
make go-fmt
git diff --exit-code .
- name: Generated
run: |
make deepcopy-gen
git diff --exit-code .
- name: Build
run: make build

Expand Down Expand Up @@ -108,6 +113,5 @@ jobs:

- name: download mdox
run: go install -a github.com/bwplotka/mdox@latest

- run: make check-docs

- run: make check-docs
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ We use the following categories for changes:

### Added
- Alerts from promscale monitoring mixin are groupped also by namespace label [#1714]
- Added a new family of metrics tracking database maintenance jobs durations and failures [#1745]

### Changed
- Reduced the verbosity of the logs emitted by the vacuum engine [#1715]
Expand Down
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,15 @@ check-docs:
@echo ">> checking formatting and local/remote links"
$(MDOX_BIN) fmt --soft-wraps --check -l --links.validate.config-file=$(MDOX_VALIDATE_CONFIG) **/*.md

.PHONY: deepcopy-gen
deepcopy-gen: deepcopy-gen-install
@echo ">> generating deepcopy code"
deepcopy-gen -i ./pkg/dataset -h build/deepcopy-gen-header.txt -o '.'

.PHONY: deepcopy-gen-install
deepcopy-gen-install:
@echo ">> installing deepcopy-gen"
go install k8s.io/code-generator/cmd/deepcopy-gen@latest

.PHONY: all
all: build test go-fmt go-lint
3 changes: 3 additions & 0 deletions build/deepcopy-gen-header.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// This file and its contents are licensed under the Apache License 2.0.
// Please see the included NOTICE for copyright information and
// LICENSE for a copy of the license.
4 changes: 2 additions & 2 deletions docker-compose/promscale-demo/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ services:
- "16686:16686"

grafana:
image: vineeth97/promscale-demo-grafana
image: timescale/promscale-demo-grafana
restart: on-failure
volumes:
- grafana-data:/var/lib/grafana
Expand Down Expand Up @@ -152,4 +152,4 @@ services:

volumes:
timescaledb-data:
grafana-data:
grafana-data:
Loading

0 comments on commit d8af20d

Please # to comment.