Skip to content

Commit ab1638b

Browse files
authored
Add exclusion support for alerts (#101)
* Added idea IDE folder to gitignore * Added alert rule exclusion support Requires grafana/dashboard-linter#115 * Tidied up go.mod Tidied with compatibility with Go 1.17 * Updated to use latest dashboard-linter Changes include required prerequisites for alert exclusions * Updated golangci-lint version * Addressed PR comments * Added missing go.sum entry for sirupsen/logrus * Addressed comments pt. 2
1 parent 4c07d4e commit ab1638b

File tree

4 files changed

+172
-383
lines changed

4 files changed

+172
-383
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
/_output/
2-
/mixtool
2+
/mixtool

go.mod

Lines changed: 41 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ go 1.17
55
require (
66
github.com/fatih/color v1.13.0
77
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
8-
github.com/grafana/dashboard-linter v0.0.0-20220928163753-067805793faa
98
github.com/prometheus/prometheus v1.8.2-0.20220202150209-4e08110891fd
109
)
1110

@@ -15,57 +14,74 @@ require (
1514
github.com/Masterminds/semver/v3 v3.1.1 // indirect
1615
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
1716
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
18-
github.com/armon/go-metrics v0.3.10 // indirect
17+
github.com/armon/go-metrics v0.4.0 // indirect
1918
github.com/aws/aws-sdk-go v1.42.31 // indirect
2019
github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 // indirect
2120
github.com/edsrzf/mmap-go v1.1.0 // indirect
2221
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 // indirect
22+
github.com/fsnotify/fsnotify v1.6.0 // indirect
2323
github.com/gobuffalo/logger v1.0.6 // indirect
2424
github.com/gobuffalo/packd v1.0.1 // indirect
2525
github.com/golang/snappy v0.0.4 // indirect
26+
github.com/golangci/golangci-lint v1.50.2-0.20230108125247-43e1edae935c // indirect
27+
github.com/google/go-cmp v0.5.9 // indirect
2628
github.com/google/uuid v1.3.0 // indirect
29+
github.com/grafana/dashboard-linter v0.0.0-20230109154023-d88c9634eb7f // indirect
30+
github.com/hashicorp/consul/api v1.15.3 // indirect
2731
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
2832
github.com/hashicorp/go-hclog v1.2.0 // indirect
2933
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
30-
github.com/hashicorp/serf v0.9.7 // indirect
34+
github.com/hashicorp/hcl v1.0.0 // indirect
35+
github.com/hashicorp/serf v0.9.8 // indirect
3136
github.com/huandu/xstrings v1.3.2 // indirect
3237
github.com/imdario/mergo v0.3.12 // indirect
38+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
3339
github.com/jmespath/go-jmespath v0.4.0 // indirect
3440
github.com/jpillora/backoff v1.0.0 // indirect
3541
github.com/karrick/godirwalk v1.16.1 // indirect
42+
github.com/magiconair/properties v1.8.6 // indirect
3643
github.com/markbates/errx v1.1.0 // indirect
3744
github.com/markbates/oncer v1.0.0 // indirect
3845
github.com/markbates/safe v1.0.1 // indirect
39-
github.com/mattn/go-colorable v0.1.12 // indirect
40-
github.com/mattn/go-isatty v0.0.14 // indirect
46+
github.com/mattn/go-colorable v0.1.13 // indirect
47+
github.com/mattn/go-isatty v0.0.16 // indirect
4148
github.com/mitchellh/copystructure v1.2.0 // indirect
49+
github.com/mitchellh/mapstructure v1.5.0 // indirect
4250
github.com/mitchellh/reflectwalk v1.0.2 // indirect
4351
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
4452
github.com/oklog/ulid v1.3.1 // indirect
4553
github.com/opentracing/opentracing-go v1.2.0 // indirect
54+
github.com/pelletier/go-toml v1.9.5 // indirect
55+
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
4656
github.com/prometheus/common/sigv4 v0.1.0 // indirect
4757
github.com/russross/blackfriday/v2 v2.1.0 // indirect
4858
github.com/shopspring/decimal v1.3.1 // indirect
49-
github.com/sirupsen/logrus v1.8.1 // indirect
50-
github.com/stretchr/objx v0.4.0 // indirect
59+
github.com/sirupsen/logrus v1.9.0 // indirect
60+
github.com/spf13/afero v1.9.2 // indirect
61+
github.com/spf13/cobra v1.6.1 // indirect
62+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
63+
github.com/spf13/pflag v1.0.5 // indirect
64+
github.com/spf13/viper v1.14.0 // indirect
65+
github.com/stretchr/objx v0.5.0 // indirect
66+
github.com/subosito/gotenv v1.4.1 // indirect
5167
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
5268
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
53-
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
54-
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
55-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
56-
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
57-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
58-
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
69+
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
70+
golang.org/x/net v0.4.0 // indirect
71+
golang.org/x/oauth2 v0.3.0 // indirect
72+
golang.org/x/sync v0.1.0 // indirect
73+
golang.org/x/term v0.3.0 // indirect
74+
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
5975
google.golang.org/appengine v1.6.7 // indirect
60-
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
61-
google.golang.org/grpc v1.46.2 // indirect
76+
google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e // indirect
77+
gopkg.in/ini.v1 v1.67.0 // indirect
6278
sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 // indirect
6379
sigs.k8s.io/yaml v1.3.0 // indirect
6480
)
6581

6682
require (
6783
github.com/beorn7/perks v1.0.1 // indirect
68-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
84+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
6985
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
7086
github.com/davecgh/go-spew v1.1.1 // indirect
7187
github.com/dennwc/varint v1.0.0 // indirect
@@ -76,20 +92,20 @@ require (
7692
github.com/google/go-jsonnet v0.18.0
7793
github.com/grafana/tanka v0.23.1
7894
github.com/jsonnet-bundler/jsonnet-bundler v0.5.1
79-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
95+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8096
github.com/pkg/errors v0.9.1
8197
github.com/pmezard/go-difflib v1.0.0 // indirect
82-
github.com/prometheus/client_golang v1.13.0 // indirect
83-
github.com/prometheus/client_model v0.2.0 // indirect
84-
github.com/prometheus/common v0.37.0 // indirect
98+
github.com/prometheus/client_golang v1.14.0 // indirect
99+
github.com/prometheus/client_model v0.3.0 // indirect
100+
github.com/prometheus/common v0.39.0 // indirect
85101
github.com/prometheus/procfs v0.8.0 // indirect
86102
github.com/spf13/cast v1.5.0 // indirect
87-
github.com/stretchr/testify v1.8.0
103+
github.com/stretchr/testify v1.8.1
88104
github.com/urfave/cli v1.22.10
89-
go.uber.org/atomic v1.9.0 // indirect
90-
go.uber.org/goleak v1.1.12 // indirect
91-
golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 // indirect
92-
golang.org/x/text v0.3.7 // indirect
105+
go.uber.org/atomic v1.10.0 // indirect
106+
go.uber.org/goleak v1.2.0 // indirect
107+
golang.org/x/sys v0.4.0 // indirect
108+
golang.org/x/text v0.6.0 // indirect
93109
google.golang.org/protobuf v1.28.1 // indirect
94110
gopkg.in/yaml.v2 v2.4.0 // indirect
95111
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)