Skip to content

Commit de88b8f

Browse files
committed
update linters
1 parent 720b73e commit de88b8f

File tree

4 files changed

+29
-14
lines changed

4 files changed

+29
-14
lines changed

.golangci.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,18 @@ linters:
2828
- tagliatelle
2929
- varnamelen
3030
- wrapcheck
31+
- golint # deprecated
32+
- nosnakecase # deprecated
33+
- scopelint # deprecated
34+
- ifshort # deprecated
35+
- interfacer # deprecated
36+
- structcheck # deprecated
37+
- maligned # deprecated
38+
- varcheck # deprecated
39+
- deadcode # deprecated
3140
linters-settings:
3241
funlen:
3342
ignore-comments: true
3443
lines: 75
35-
estif:
44+
nestif:
3645
min-complexity: 4
37-
maligned:
38-
suggest-new: true

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ require (
1616
github.com/davecgh/go-spew v1.1.1 // indirect
1717
github.com/mattn/go-isatty v0.0.16 // indirect
1818
github.com/pmezard/go-difflib v1.0.0 // indirect
19-
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
19+
golang.org/x/mod v0.16.0 // indirect
20+
golang.org/x/sys v0.18.0 // indirect
21+
golang.org/x/tools v0.19.0 // indirect
2022
)

go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,15 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
1919
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
2020
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
2121
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
22+
golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
23+
golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
2224
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2325
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU=
2426
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
27+
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
28+
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
29+
golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
30+
golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
2531
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
2632
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
2733
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

modules/icinga2/collector.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ var detailedFiles = []string{
3636
}
3737

3838
var commands = map[string][]string{
39-
"version.txt": {"icinga2", "-V"},
40-
"config-check.txt": {"icinga2", "daemon", "-C"},
41-
"objects-zones.txt": {"icinga2", "object", "list", "--type", "Zone"},
42-
"objects-endpoints.txt": {"icinga2", "object", "list", "--type", "Endpoint"},
43-
"variables.txt": {"icinga2", "variable", "list"},
44-
"features.txt": {"icinga2", "feature", "list"},
45-
"user-icinga.txt": {"id", "icinga"},
46-
"user-nagios.txt": {"id", "nagios"},
47-
"icinga2-api-stage-directories.txt": {"ls", "-ld" , "/var/lib/icinga2/api/packages/_api/*/"},
48-
"director-api-stage-directories.txt": {"ls", "-ld" , "/var/lib/icinga2/api/packages/director/*/"},
39+
"version.txt": {"icinga2", "-V"},
40+
"config-check.txt": {"icinga2", "daemon", "-C"},
41+
"objects-zones.txt": {"icinga2", "object", "list", "--type", "Zone"},
42+
"objects-endpoints.txt": {"icinga2", "object", "list", "--type", "Endpoint"},
43+
"variables.txt": {"icinga2", "variable", "list"},
44+
"features.txt": {"icinga2", "feature", "list"},
45+
"user-icinga.txt": {"id", "icinga"},
46+
"user-nagios.txt": {"id", "nagios"},
47+
"icinga2-api-stage-directories.txt": {"ls", "-ld", "/var/lib/icinga2/api/packages/_api/*/"},
48+
"director-api-stage-directories.txt": {"ls", "-ld", "/var/lib/icinga2/api/packages/director/*/"},
4949
}
5050

5151
var detailedCommands = map[string][]string{

0 commit comments

Comments
 (0)