Skip to content
This repository was archived by the owner on Dec 1, 2018. It is now read-only.

Commit 114a808

Browse files
burmanmburmanm
committed
Update Hawkular-Metrics driver
1 parent 9077e7e commit 114a808

File tree

5 files changed

+362
-179
lines changed

5 files changed

+362
-179
lines changed

‎metrics/sinks/hawkular/client.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ func (h *hawkularSink) updateDefinitions(mt metrics.MetricType) error {
4646
// If no descriptorTag is found, this metric does not belong to Heapster
4747
if mk, found := p.Tags[descriptorTag]; found {
4848
if model, f := h.models[mk]; f && !h.recent(p, model) {
49-
if err := h.client.UpdateTags(mt, p.Id, p.Tags, h.modifiers...); err != nil {
49+
if err := h.client.UpdateTags(mt, p.ID, p.Tags, h.modifiers...); err != nil {
5050
return err
5151
}
5252
}
53-
h.reg[p.Id] = p
53+
h.reg[p.ID] = p
5454
}
5555
}
5656

@@ -88,7 +88,7 @@ func (h *hawkularSink) descriptorToDefinition(md *core.MetricDescriptor) metrics
8888
tags[descriptorTag] = md.Name
8989

9090
hmd := metrics.MetricDefinition{
91-
Id: md.Name,
91+
ID: md.Name,
9292
Tags: tags,
9393
Type: heapsterTypeToHawkularType(md.Type),
9494
}
@@ -287,11 +287,11 @@ func (h *hawkularSink) pointToLabeledMetricHeader(ms *core.MetricSet, metric cor
287287

288288
m := metrics.Datapoint{
289289
Value: value,
290-
Timestamp: metrics.UnixMilli(timestamp),
290+
Timestamp: timestamp,
291291
}
292292

293293
mh := &metrics.MetricHeader{
294-
Id: name,
294+
ID: name,
295295
Data: []metrics.Datapoint{m},
296296
Type: heapsterTypeToHawkularType(metric.MetricType),
297297
}

‎metrics/sinks/hawkular/driver_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func TestDescriptorTransform(t *testing.T) {
5757

5858
md := hSink.descriptorToDefinition(&smd)
5959

60-
assert.Equal(t, smd.Name, md.Id)
60+
assert.Equal(t, smd.Name, md.ID)
6161
assert.Equal(t, 3, len(md.Tags)) // descriptorTag, unitsTag, typesTag, k1
6262

6363
assert.Equal(t, smd.Units.String(), md.Tags[unitsTag])
@@ -122,7 +122,7 @@ func TestMetricTransform(t *testing.T) {
122122
assert.NoError(t, err)
123123

124124
assert.Equal(t, fmt.Sprintf("%s/%s/%s", metricSet.Labels[core.LabelContainerName.Key],
125-
metricSet.Labels[core.LabelPodId.Key], metricName), m.Id)
125+
metricSet.Labels[core.LabelPodId.Key], metricName), m.ID)
126126

127127
assert.Equal(t, 1, len(m.Data))
128128
_, ok := m.Data[0].Value.(float64)
@@ -134,21 +134,21 @@ func TestMetricTransform(t *testing.T) {
134134
m, err = hSink.pointToLabeledMetricHeader(&metricSet, metricSet.LabeledMetrics[2], now)
135135
assert.NoError(t, err)
136136

137-
assert.Equal(t, fmt.Sprintf("%s/%s/%s", metricSet.Labels[core.LabelContainerName.Key], metricSet.Labels[core.LabelNodename.Key], metricName), m.Id)
137+
assert.Equal(t, fmt.Sprintf("%s/%s/%s", metricSet.Labels[core.LabelContainerName.Key], metricSet.Labels[core.LabelNodename.Key], metricName), m.ID)
138138

139139
//
140140
m, err = hSink.pointToLabeledMetricHeader(&metricSet, metricSet.LabeledMetrics[0], now)
141141
assert.NoError(t, err)
142142

143143
assert.Equal(t, fmt.Sprintf("%s/%s/%s/%s", metricSet.Labels[core.LabelContainerName.Key],
144144
metricSet.Labels[core.LabelNodename.Key], labeledMetricNameA,
145-
metricSet.LabeledMetrics[0].Labels[core.LabelResourceID.Key]), m.Id)
145+
metricSet.LabeledMetrics[0].Labels[core.LabelResourceID.Key]), m.ID)
146146

147147
//
148148
m, err = hSink.pointToLabeledMetricHeader(&metricSet, metricSet.LabeledMetrics[1], now)
149149
assert.NoError(t, err)
150150
assert.Equal(t, fmt.Sprintf("%s/%s/%s", metricSet.Labels[core.LabelContainerName.Key],
151-
metricSet.Labels[core.LabelNodename.Key], labeledMetricNameB), m.Id)
151+
metricSet.Labels[core.LabelNodename.Key], labeledMetricNameB), m.ID)
152152
}
153153

154154
func TestMetricIds(t *testing.T) {
@@ -181,43 +181,43 @@ func TestMetricIds(t *testing.T) {
181181
//
182182
m, err := hSink.pointToLabeledMetricHeader(&metricSet, metricSet.LabeledMetrics[0], now)
183183
assert.NoError(t, err)
184-
assert.Equal(t, fmt.Sprintf("%s/%s/%s", metricSet.Labels[core.LabelContainerName.Key], metricSet.Labels[core.LabelPodId.Key], metricName), m.Id)
184+
assert.Equal(t, fmt.Sprintf("%s/%s/%s", metricSet.Labels[core.LabelContainerName.Key], metricSet.Labels[core.LabelPodId.Key], metricName), m.ID)
185185

186186
//
187187
metricSet.Labels[core.LabelMetricSetType.Key] = core.MetricSetTypeNode
188188
m, err = hSink.pointToLabeledMetricHeader(&metricSet, metricSet.LabeledMetrics[0], now)
189189
assert.NoError(t, err)
190-
assert.Equal(t, fmt.Sprintf("%s/%s/%s", "machine", metricSet.Labels[core.LabelNodename.Key], metricName), m.Id)
190+
assert.Equal(t, fmt.Sprintf("%s/%s/%s", "machine", metricSet.Labels[core.LabelNodename.Key], metricName), m.ID)
191191

192192
//
193193
metricSet.Labels[core.LabelMetricSetType.Key] = core.MetricSetTypePod
194194
m, err = hSink.pointToLabeledMetricHeader(&metricSet, metricSet.LabeledMetrics[0], now)
195195
assert.NoError(t, err)
196-
assert.Equal(t, fmt.Sprintf("%s/%s/%s", core.MetricSetTypePod, metricSet.Labels[core.LabelPodId.Key], metricName), m.Id)
196+
assert.Equal(t, fmt.Sprintf("%s/%s/%s", core.MetricSetTypePod, metricSet.Labels[core.LabelPodId.Key], metricName), m.ID)
197197

198198
//
199199
metricSet.Labels[core.LabelMetricSetType.Key] = core.MetricSetTypePodContainer
200200
m, err = hSink.pointToLabeledMetricHeader(&metricSet, metricSet.LabeledMetrics[0], now)
201201
assert.NoError(t, err)
202-
assert.Equal(t, fmt.Sprintf("%s/%s/%s", metricSet.Labels[core.LabelContainerName.Key], metricSet.Labels[core.LabelPodId.Key], metricName), m.Id)
202+
assert.Equal(t, fmt.Sprintf("%s/%s/%s", metricSet.Labels[core.LabelContainerName.Key], metricSet.Labels[core.LabelPodId.Key], metricName), m.ID)
203203

204204
//
205205
metricSet.Labels[core.LabelMetricSetType.Key] = core.MetricSetTypeSystemContainer
206206
m, err = hSink.pointToLabeledMetricHeader(&metricSet, metricSet.LabeledMetrics[0], now)
207207
assert.NoError(t, err)
208-
assert.Equal(t, fmt.Sprintf("%s/%s/%s/%s", core.MetricSetTypeSystemContainer, metricSet.Labels[core.LabelContainerName.Key], metricSet.Labels[core.LabelPodId.Key], metricName), m.Id)
208+
assert.Equal(t, fmt.Sprintf("%s/%s/%s/%s", core.MetricSetTypeSystemContainer, metricSet.Labels[core.LabelContainerName.Key], metricSet.Labels[core.LabelPodId.Key], metricName), m.ID)
209209

210210
//
211211
metricSet.Labels[core.LabelMetricSetType.Key] = core.MetricSetTypeCluster
212212
m, err = hSink.pointToLabeledMetricHeader(&metricSet, metricSet.LabeledMetrics[0], now)
213213
assert.NoError(t, err)
214-
assert.Equal(t, fmt.Sprintf("%s/%s", core.MetricSetTypeCluster, metricName), m.Id)
214+
assert.Equal(t, fmt.Sprintf("%s/%s", core.MetricSetTypeCluster, metricName), m.ID)
215215

216216
//
217217
metricSet.Labels[core.LabelMetricSetType.Key] = core.MetricSetTypeNamespace
218218
m, err = hSink.pointToLabeledMetricHeader(&metricSet, metricSet.LabeledMetrics[0], now)
219219
assert.NoError(t, err)
220-
assert.Equal(t, fmt.Sprintf("%s/%s/%s", core.MetricSetTypeNamespace, metricSet.Labels[core.LabelNamespaceName.Key], metricName), m.Id)
220+
assert.Equal(t, fmt.Sprintf("%s/%s/%s", core.MetricSetTypeNamespace, metricSet.Labels[core.LabelNamespaceName.Key], metricName), m.ID)
221221

222222
}
223223

@@ -232,7 +232,7 @@ func TestRecentTest(t *testing.T) {
232232
modelT["hep"+descriptionTag] = "n"
233233

234234
model := metrics.MetricDefinition{
235-
Id: id,
235+
ID: id,
236236
Tags: modelT,
237237
}
238238

@@ -242,7 +242,7 @@ func TestRecentTest(t *testing.T) {
242242
}
243243

244244
live := metrics.MetricDefinition{
245-
Id: "test/" + id,
245+
ID: "test/" + id,
246246
Tags: liveT,
247247
}
248248

@@ -421,7 +421,7 @@ func TestStoreTimeseries(t *testing.T) {
421421

422422
assert.Equal(t, 1, len(mH))
423423

424-
ids = append(ids, mH[0].Id)
424+
ids = append(ids, mH[0].ID)
425425
}))
426426
defer s.Close()
427427

@@ -753,7 +753,7 @@ func TestBatchingTimeseries(t *testing.T) {
753753
assert.NoError(t, err)
754754

755755
for _, v := range mH {
756-
ids = append(ids, v.Id)
756+
ids = append(ids, v.ID)
757757
}
758758

759759
calls++

0 commit comments

Comments
 (0)