-
Notifications
You must be signed in to change notification settings - Fork 440
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add prometheus metrics for experiment and trial #870
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
66 changes: 66 additions & 0 deletions
66
pkg/controller.v1alpha3/experiment/util/prometheus_metrics.go
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
/* | ||
Copyright 2019 The Kubernetes Authors. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package util | ||
|
||
import ( | ||
"github.com/prometheus/client_golang/prometheus" | ||
|
||
"sigs.k8s.io/controller-runtime/pkg/metrics" | ||
) | ||
|
||
var ( | ||
experimentsDeletedCount = prometheus.NewCounter(prometheus.CounterOpts{ | ||
Name: "katib_experiment_deleted", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we need to rename the metrics? |
||
Help: "Counts number of Experiment deleted", | ||
}) | ||
experimentsCreatedCount = prometheus.NewCounter(prometheus.CounterOpts{ | ||
Name: "katib_experiment_created", | ||
Help: "Counts number of Experiment created", | ||
}) | ||
experimentsSucceededCount = prometheus.NewCounter(prometheus.CounterOpts{ | ||
Name: "katib_experiment_succeeded", | ||
Help: "Counts number of Experiment succeeded", | ||
}) | ||
experimentsFailedCount = prometheus.NewCounter(prometheus.CounterOpts{ | ||
Name: "katib_experiment_failed", | ||
Help: "Counts number of Experiment failed", | ||
}) | ||
) | ||
|
||
func init() { | ||
metrics.Registry.MustRegister( | ||
experimentsDeletedCount, | ||
experimentsCreatedCount, | ||
experimentsSucceededCount, | ||
experimentsFailedCount) | ||
} | ||
|
||
func IncreaseExperimentsDeletedCount() { | ||
experimentsDeletedCount.Inc() | ||
} | ||
|
||
func IncreaseExperimentsCreatedCount() { | ||
experimentsCreatedCount.Inc() | ||
} | ||
|
||
func IncreaseExperimentsSucceededCount() { | ||
experimentsSucceededCount.Inc() | ||
} | ||
|
||
func IncreaseExperimentsFailedCount() { | ||
experimentsFailedCount.Inc() | ||
} |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
/* | ||
Copyright 2019 The Kubernetes Authors. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package trial | ||
|
||
import ( | ||
"github.com/prometheus/client_golang/prometheus" | ||
|
||
"sigs.k8s.io/controller-runtime/pkg/metrics" | ||
) | ||
|
||
var ( | ||
trialsDeletedCount = prometheus.NewCounter(prometheus.CounterOpts{ | ||
Name: "katib_trial_deleted", | ||
Help: "Counts number of Trial deleted", | ||
}) | ||
trialsCreatedCount = prometheus.NewCounter(prometheus.CounterOpts{ | ||
Name: "katib_trial_created", | ||
Help: "Counts number of Trial created", | ||
}) | ||
trialsSucceededCount = prometheus.NewCounter(prometheus.CounterOpts{ | ||
Name: "katib_trial_succeeded", | ||
Help: "Counts number of Trial succeeded", | ||
}) | ||
trialsFailedCount = prometheus.NewCounter(prometheus.CounterOpts{ | ||
Name: "katib_trial_failed", | ||
Help: "Counts number of Trial failed", | ||
}) | ||
) | ||
|
||
func init() { | ||
metrics.Registry.MustRegister( | ||
trialsDeletedCount, | ||
trialsCreatedCount, | ||
trialsSucceededCount, | ||
trialsFailedCount) | ||
} | ||
|
||
func IncreaseTrialsDeletedCount() { | ||
trialsDeletedCount.Inc() | ||
} | ||
|
||
func IncreaseTrialsCreatedCount() { | ||
trialsCreatedCount.Inc() | ||
} | ||
|
||
func IncreaseTrialsSucceededCount() { | ||
trialsSucceededCount.Inc() | ||
} | ||
|
||
func IncreaseTrialsFailedCount() { | ||
trialsFailedCount.Inc() | ||
} |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of Increase, increment seems more appropriate?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do you mean rename
IncreaseExperimentsDeletedCount
toIncrement ExperimentsDeletedCount
? If so, I thinkIncrease
is better, since it is a verbThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@hougangliu when we specify counters, we typically specify the term
Increment
. SeeInc
definition in prometheus https://github.com/kubeflow/katib/blob/master/vendor/github.com/prometheus/client_golang/prometheus/counter.go#L37Or, should we directly call experimentsDeletedCount.Inc() ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I find it. In fact https://github.com/kubeflow/katib/blob/master/vendor/github.com/prometheus/client_golang/prometheus/counter.go#L37 should use
increase
too, it should be a typo error.The reason why I didn't use
experimentsDeletedCount.Inc()
is that other package "pkg/controller.v1alpha3/experiment/util" also call it, butexperimentsDeletedCount
cannot be access by other packages