Add Prometheus config and metric sync #82
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lippserd
requested changes
May 27, 2024
internal/config.go
Outdated
| ) | ||
|
|
||
| // PrometheusConfig defines Prometheus configuration. | ||
| type PrometheusConfig struct { |
There was a problem hiding this comment.
There is metrics#PrometheusConfig and here internal#PrometheusConfig. The latter can be removed.
| } | ||
|
|
||
| // Validate checks constraints in the supplied Prometheus configuration and returns an error if they are violated. | ||
| func (c *PrometheusConfig) Validate() error { |
There was a problem hiding this comment.
I would let Validate() always return nil and simply disable metric collection if host is not configured, i.e. empty.
cmd/icinga-kubernetes/main.go
Outdated
| klog.Fatal(errors.Wrap(err, "can't create configuration")) | ||
| } | ||
|
|
||
| promClient, err := promapi.NewClient(promapi.Config{Address: cfg.Prometheus.Host + ":" + strconv.Itoa(cfg.Prometheus.Port)}) |
There was a problem hiding this comment.
There is utils.JoinHostPort from Icinga Go Library. Also, there should be a reasonable default for the Prometheus port.
go.mod
Outdated
| go 1.21 | ||
| go 1.22 | ||
|
|
||
| toolchain go1.22.2 |
schema/mysql/schema.sql
Outdated
| @@ -464,7 +464,7 @@ CREATE TABLE config_map ( | |||
|
|
|||
| CREATE TABLE data ( | |||
| id binary(20) NOT NULL, | |||
| name varchar(63) COLLATE utf8mb4_unicode_ci NOT NULL, | |||
| name varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, | |||
There was a problem hiding this comment.
Please revert that change. Will be fixed in main.
pkg/metrics/metrics.go
Outdated
| fmt.Printf("Warnings: %v\n", warnings) | ||
| } | ||
| if result == nil { | ||
| fmt.Println("No results found") |
There was a problem hiding this comment.
Remove all such No results found lines.
lippserd
force-pushed
the
sync-metrics
branch
2 times, most recently
from
4c74ace to
3420ebe
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add following to the main branch: