Skip to content
This repository has been archived by the owner on Jul 1, 2023. It is now read-only.

[6.1.x] Re-enable nethealth check #638

Merged
merged 1 commit into from May 19, 2020
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
Expand Up @@ -88,7 +88,7 @@ ignored = ["github.com/Sirupsen/logrus", "github.com/gravitational/planet/build/

[[constraint]]
name = "github.com/gravitational/satellite"
version = "=6.1.7"
version = "=6.1.8"

[[constraint]]
name = "github.com/gravitational/trace"
Expand Down
16 changes: 14 additions & 2 deletions lib/monitoring/checkers.go
Expand Up @@ -238,7 +238,13 @@ func addToMaster(node agent.Agent, config *Config, etcdConfig *monitoring.ETCDCo
node.AddChecker(monitoring.NewAWSHasProfileChecker())
}

// TODO: reenable nethealth checker once issues are fixed
nethealthChecker, err := monitoring.NewNethealthChecker(
monitoring.NethealthConfig{
NodeName: config.NodeName,
KubeConfig: &kubeConfig,
},
)
node.AddChecker(nethealthChecker)

return nil
}
Expand Down Expand Up @@ -287,7 +293,13 @@ func addToNode(node agent.Agent, config *Config, etcdConfig *monitoring.ETCDConf
node.AddChecker(monitoring.NewAWSHasProfileChecker())
}

// TODO: reenable nethealth checker once issues are fixed
nethealthChecker, err := monitoring.NewNethealthChecker(
monitoring.NethealthConfig{
NodeName: config.NodeName,
KubeConfig: &nodeConfig,
},
)
node.AddChecker(nethealthChecker)

return nil
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

82 changes: 65 additions & 17 deletions vendor/github.com/gravitational/satellite/monitoring/nethealth.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.