This repository has been archived by the owner on May 4, 2022. It is now read-only.
Ceilometer metrics support #86
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
This patch add ability to listen for metric data messages from Ceilometer and prepare them for PRometheus scraping.
- added missing support for AMQP1Connections to main loop for metrics - unify shared logic with main loop for events
leifmadsen
reviewed
Jul 10, 2020
| @@ -21,11 +21,11 @@ before_install: | |||
| - docker run -p 9200:9200 --name elastic -p 9300:9300 -e "discovery.type=single-node" -d docker.elastic.co/elasticsearch/elasticsearch:$ELASTIC_VERSION | |||
| - docker pull quay.io/interconnectedcloud/qdrouterd:$QDROUTERD_VERSION | |||
| - docker run -p 5672:5672 -d quay.io/interconnectedcloud/qdrouterd:$QDROUTERD_VERSION | |||
| - docker pull centos:7 | |||
| - docker pull centos:8 | |||
csibbitt
approved these changes
Jul 10, 2020
| yum remove -y git* | ||
| yum install -y git216-all | ||
| yum install -y golang qpid-proton-c-devel iproute | ||
| # below is not available currently |
There was a problem hiding this comment.
Can these just be removed, or a note added explaining when they would be uncommented?
| @@ -197,11 +191,10 @@ func (cs *CacheServer) Put(incomingData incoming.MetricDataFormat) { | |||
| case buffer = <-freeList: | |||
| //go one from buffer | |||
| default: | |||
| buffer = new(IncomingBuffer) | |||
| buffer = &IncomingBuffer{} | |||
There was a problem hiding this comment.
For my education, is there a reason other than style to prefer this version?
| if dataInterface.ISNew() { | ||
| dataInterface.SetNew(false) | ||
| for index := range dataInterface.GetValues() { | ||
| m, err := tsdb.NewPrometheusMetric(usetimestamp, dataInterface.GetDataSourceName(), dataInterface, index) |
| } | ||
|
|
||
| //GetInterval ... | ||
| //GetInterval returns hardcoded defaultCeilometerInterval, because Ceilometer metricDesc | ||
| //does not contain interval information (are not periodically sent at all) and any reasonable |
There was a problem hiding this comment.
👍 Thanks for making this explicit in the comments!
| //MetricHandlerHTML contains HTML for default endpoint | ||
| const MetricHandlerHTML = ` | ||
| <html> | ||
| <head><title>Collectd Exporter</title></head> |
There was a problem hiding this comment.
Probably should s/Collectd/Metrics/ in this block, or have it actually driven by the datasource name
| @@ -119,7 +123,7 @@ func TestCollectdIncoming(t *testing.T) { | |||
| assert.Contains(t, labels, sample.Plugin) | |||
| assert.Contains(t, labels, "instance") | |||
| // test GetMetricDesc behaviour | |||
| metricDesc := "Service Assurance exporter: 'pluginname' Type: 'collectd' Dstype: 'gauge' Dsname: 'value1'" | |||
| metricDesc := "Service Telemetry exporter: 'pluginname' Type: 'collectd' Dstype: 'gauge' Dsname: 'value1'" | |||
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR makes SG to understand Ceilometer metrics