Skip to content

Commit

Permalink
Merged in master and bumped version
Browse files Browse the repository at this point in the history
  • Loading branch information
Corbin Phelps committed Nov 20, 2018
1 parent 6671bec commit 7baf55c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 171 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## 1.0.1 - 2018-11-20
### Changed
- Added host and IP to Nodes as additional attributes

## 1.0.0 - 2018-11-16
### Changed
- Updated to version 1.0.0
Expand Down
2 changes: 1 addition & 1 deletion src/elasticsearch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ type argumentList struct {

const (
integrationName = "com.newrelic.elasticsearch"
integrationVersion = "1.0.0"
integrationVersion = "1.0.1"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion src/metric_definition.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ type NodeCounts struct {
type Node struct {
Name *string `json:"name"`
Host *string `json:"host" metric_name:"node.hostname" source_type:"attribute"`
IP *string `json:"ip" metric_name:"node.ipAddress" source_type:"attribute"`
IP *string `json:"ip" metric_name:"node.ipAddress" source_type:"attribute"`
Indices *NodeIndices `json:"indices"`
Breakers *NodeBreakers `json:"breakers"`
Process *NodeProcess `json:"process"`
Expand Down
170 changes: 1 addition & 169 deletions src/testdata/nodeStatsMetricsResult.json.golden
View file
Original file line number Diff line number Diff line change
@@ -1,169 +1 @@
{
"activeSearches": 0,
"breakers.estimatedSizeFieldDataCircuitBreakerInBytes": 0,
"breakers.estimatedSizeParentCircuitBreakerInBytes": 0,
"breakers.estimatedSizeRequestCircuitBreakerInBytes": 0,
"breakers.fieldDataCircuitBreakerTripped": 0,
"breakers.parentCircuitBreakerTripped": 0,
"breakers.requestCircuitBreakerTripped": 0,
"cache.cacheSizeIDInBytes": 378599,
"displayName": "T6Paw3bBTuGldNpf9V1nFA",
"entityName": "node:T6Paw3bBTuGldNpf9V1nFA",
"event_type": "ElasticsearchNodeSample",
"flush.indexRefreshesTotal": 0,
"flush.indexRefreshesTotalInMilliseconds": 0,
"fs.bytesAvailableJVMInBytes": 162707742720,
"fs.bytesReadsInBytes": 7904,
"fs.iOOperations": 235195,
"fs.reads": 99,
"fs.totalSizeInBytes": 164705353728,
"fs.unallocatedBytesInBYtes": 162707742720,
"fs.writesInBytes": 235096,
"get.currentRequestsRunning": 0,
"get.requestsDcoumentExists": 0,
"get.requestsDcoumentMissing": 0,
"get.requestsDocumentExistsInMilliseconds": 0,
"get.requestsDocumentMissingInMilliseconds": 0,
"get.timeGetRequestsInMilliseconds": 0,
"get.totalGetRequests": 0,
"http.currentOpenConnections": 2,
"http.openedConnections": 147,
"indexing.docsCurrentlyDeleted": 0,
"indexing.documentsCurrentlyIndexing": 0,
"indexing.documentsIndexed": 0,
"indexing.timeDeletingDocumentsInMilliseconds": 0,
"indexing.timeIndexingDocumentsInMilliseconds": 0,
"indexing.totalDocumentsDeleted": 0,
"indices.indexingOperationsFailed": 0,
"indices.indexingWaitedThrottlingInMilliseconds": 0,
"indices.memoryQueryCacheInBytes": 0,
"indices.numberIndices": 0,
"indices.queryCacheEvictions": 0,
"indices.queryCacheHits": 0,
"indices.queryCacheMisses": 0,
"indices.recoveryOngoingShardSource": 0,
"indices.recoveryOngoingShardTarget": 0,
"indices.recoveryWaitedThrottlingInMilliseconds": 0,
"indices.requestCacheEvictions": 0,
"indices.requestCacheHits": 0,
"indices.requestCacheMemoryInBytes": 0,
"indices.requestCacheMisses": 0,
"indices.segmentsIndexShard": 0,
"indices.segmentsMaxMemoryIndexWriterInBytes": 7423798234978,
"indices.segmentsMemoryUsedDocValuesInBytes": 0,
"indices.segmentsMemoryUsedFixedBitSetInBytes": 0,
"indices.segmentsMemoryUsedIndexSegmentsInBytes": 0,
"indices.segmentsMemoryUsedIndexWriterInBytes": 0,
"indices.segmentsMemoryUsedNormsInBytes": 0,
"indices.segmentsMemoryUsedSegmentVersionMapInBytes": 0,
"indices.segmentsMemoryUsedStoredFieldsInBytes": 0,
"indices.segmentsMemoryUsedTermVectorsInBytes": 0,
"indices.segmentsMemoryUsedTermsInBytes": 0,
"indices.translogOperations": 0,
"indices.translogOperationsInBytes": 0,
"jvm.ThreadsActive": 55,
"jvm.ThreadsPeak": 56,
"jvm.gc.collections": 100,
"jvm.gc.collectionsInMilliseconds": 100,
"jvm.gc.concurrentMarkSweep": 50,
"jvm.gc.concurrentMarkSweepInMilliseconds": 7238,
"jvm.gc.majorCollectionsOldGenerationObjects": 2,
"jvm.gc.majorCollectionsOldGenerationObjectsInMilliseconds": 128,
"jvm.gc.majorCollectionsYoungGenerationObjects": 108,
"jvm.gc.majorCollectionsYoungGenerationObjectsInMilliseconds": 1752,
"jvm.gc.parallelNewCollections": 2189,
"jvm.gc.parallelNewCollectionsInMilliseconds": 329,
"jvm.mem.heapCommittedInBytes": 1056309248,
"jvm.mem.heapMaxInBytes": 1056309248,
"jvm.mem.heapUsed": 2983749827,
"jvm.mem.heapUsedInBytes": 225181888,
"jvm.mem.maxOldGenerationHeapInBytes": 899284992,
"jvm.mem.maxSurvivorSpaceInBYtes": 17432576,
"jvm.mem.maxYoungGenerationHeapInBytes": 139591680,
"jvm.mem.nonHeapCommittedInBytes": 108519424,
"jvm.mem.nonHeapUsedInBytes": 100466784,
"jvm.mem.usedOldGenerationHeapInBytes": 127243224,
"jvm.mem.usedSurvivorSpaceInBytes": 94752,
"jvm.mem.usedYoungGenerationHeapInBytes": 97843912,
"merges.currentActive": 0,
"merges.docsSegmentMerges": 0,
"merges.docsSegmentsMerging": 0,
"merges.mergedSegmentsInBytes": 0,
"merges.segmentMerges": 0,
"merges.sizeSegmentsMergingInBytes": 0,
"merges.totalSegmentMergingInMilliseconds": 0,
"node.hostname": "10.33.104.186",
"node.ipAddress": "10.33.104.186:9300",
"openFD": 213,
"queriesTotal": 0,
"refresh.total": 0,
"refresh.totalInMilliseconds": 0,
"searchFetchCurrentlyRunning": 0,
"searchFetches": 0,
"sizeStoreInBytes": 0,
"threadpool.bulk.Aueue": 234,
"threadpool.bulkActive": 3,
"threadpool.bulkRejected": 2,
"threadpool.bulkThreads": 23,
"threadpool.fetchShardStartedQueue": 0,
"threadpool.fetchShardStartedRejected": 0,
"threadpool.fetchShardStartedThreads": 0,
"threadpool.fetchShardStoreActive": 0,
"threadpool.fetchShardStoreQueue": 0,
"threadpool.fetchShardStoreRejected": 0,
"threadpool.fetchShardStoreThreads": 0,
"threadpool.flushActive": 0,
"threadpool.flushQueue": 0,
"threadpool.flushRejected": 0,
"threadpool.flushThreads": 0,
"threadpool.forceMergeActive": 0,
"threadpool.forceMergeQueue": 0,
"threadpool.forceMergeRejected": 0,
"threadpool.forceMergeThreads": 0,
"threadpool.genericActive": 0,
"threadpool.genericQueue": 0,
"threadpool.genericRejected": 0,
"threadpool.genericThreads": 5,
"threadpool.getActive": 0,
"threadpool.getQueue": 0,
"threadpool.getRejected": 0,
"threadpool.getThreads": 0,
"threadpool.indexActive": 0,
"threadpool.indexQueue": 0,
"threadpool.indexRejected": 0,
"threadpool.indexThreads": 0,
"threadpool.listenerActive": 0,
"threadpool.listenerQueue": 0,
"threadpool.listenerRejected": 0,
"threadpool.listenerThreads": 0,
"threadpool.managementActive": 1,
"threadpool.managementQueue": 0,
"threadpool.managementRejected": 0,
"threadpool.managementThreads": 3,
"threadpool.mergeActive": 3,
"threadpool.mergeQueue": 39,
"threadpool.mergeRejected": 837,
"threadpool.mergeThreads": 9,
"threadpool.percolateActive": 8,
"threadpool.percolateQueue": 78,
"threadpool.percolateRejected": 8,
"threadpool.percolateThreads": 9,
"threadpool.refreshActive": 0,
"threadpool.refreshQueue": 0,
"threadpool.refreshRejected": 0,
"threadpool.refreshThreads": 0,
"threadpool.searchActive": 0,
"threadpool.searchQueue": 0,
"threadpool.searchRejected": 0,
"threadpool.searchThreads": 0,
"threadpool.snapshotActive": 0,
"threadpool.snapshotQueue": 0,
"threadpool.snapshotRejected": 0,
"threadpool.snapshotThreads": 0,
"threadpoolActivefetchShardStarted": 0,
"transport.connectionsOpened": 0,
"transport.packetsReceived": 20,
"transport.packetsReceivedInBytes": 11691,
"transport.packetsSent": 20,
"transport.packetsSentInBytes": 11691
}
{"activeSearches":0,"breakers.estimatedSizeFieldDataCircuitBreakerInBytes":0,"breakers.estimatedSizeParentCircuitBreakerInBytes":0,"breakers.estimatedSizeRequestCircuitBreakerInBytes":0,"breakers.fieldDataCircuitBreakerTripped":0,"breakers.parentCircuitBreakerTripped":0,"breakers.requestCircuitBreakerTripped":0,"cache.cacheSizeIDInBytes":378599,"displayName":"T6Paw3bBTuGldNpf9V1nFA","entityName":"node:T6Paw3bBTuGldNpf9V1nFA","event_type":"ElasticsearchNodeSample","flush.indexRefreshesTotal":0,"flush.indexRefreshesTotalInMilliseconds":0,"fs.bytesAvailableJVMInBytes":162707742720,"fs.bytesReadsInBytes":7904,"fs.iOOperations":235195,"fs.reads":99,"fs.totalSizeInBytes":164705353728,"fs.unallocatedBytesInBYtes":162707742720,"fs.writesInBytes":235096,"get.currentRequestsRunning":0,"get.requestsDcoumentExists":0,"get.requestsDcoumentMissing":0,"get.requestsDocumentExistsInMilliseconds":0,"get.requestsDocumentMissingInMilliseconds":0,"get.timeGetRequestsInMilliseconds":0,"get.totalGetRequests":0,"http.currentOpenConnections":2,"http.openedConnections":147,"indexing.docsCurrentlyDeleted":0,"indexing.documentsCurrentlyIndexing":0,"indexing.documentsIndexed":0,"indexing.timeDeletingDocumentsInMilliseconds":0,"indexing.timeIndexingDocumentsInMilliseconds":0,"indexing.totalDocumentsDeleted":0,"indices.indexingOperationsFailed":0,"indices.indexingWaitedThrottlingInMilliseconds":0,"indices.memoryQueryCacheInBytes":0,"indices.numberIndices":0,"indices.queryCacheEvictions":0,"indices.queryCacheHits":0,"indices.queryCacheMisses":0,"indices.recoveryOngoingShardSource":0,"indices.recoveryOngoingShardTarget":0,"indices.recoveryWaitedThrottlingInMilliseconds":0,"indices.requestCacheEvictions":0,"indices.requestCacheHits":0,"indices.requestCacheMemoryInBytes":0,"indices.requestCacheMisses":0,"indices.segmentsIndexShard":0,"indices.segmentsMaxMemoryIndexWriterInBytes":7423798234978,"indices.segmentsMemoryUsedDocValuesInBytes":0,"indices.segmentsMemoryUsedFixedBitSetInBytes":0,"indices.segmentsMemoryUsedIndexSegmentsInBytes":0,"indices.segmentsMemoryUsedIndexWriterInBytes":0,"indices.segmentsMemoryUsedNormsInBytes":0,"indices.segmentsMemoryUsedSegmentVersionMapInBytes":0,"indices.segmentsMemoryUsedStoredFieldsInBytes":0,"indices.segmentsMemoryUsedTermVectorsInBytes":0,"indices.segmentsMemoryUsedTermsInBytes":0,"indices.translogOperations":0,"indices.translogOperationsInBytes":0,"jvm.ThreadsActive":55,"jvm.ThreadsPeak":56,"jvm.gc.collections":100,"jvm.gc.collectionsInMilliseconds":100,"jvm.gc.concurrentMarkSweep":50,"jvm.gc.concurrentMarkSweepInMilliseconds":7238,"jvm.gc.majorCollectionsOldGenerationObjects":2,"jvm.gc.majorCollectionsOldGenerationObjectsInMilliseconds":128,"jvm.gc.majorCollectionsYoungGenerationObjects":108,"jvm.gc.majorCollectionsYoungGenerationObjectsInMilliseconds":1752,"jvm.gc.parallelNewCollections":2189,"jvm.gc.parallelNewCollectionsInMilliseconds":329,"jvm.mem.heapCommittedInBytes":1056309248,"jvm.mem.heapMaxInBytes":1056309248,"jvm.mem.heapUsed":2983749827,"jvm.mem.heapUsedInBytes":225181888,"jvm.mem.maxOldGenerationHeapInBytes":899284992,"jvm.mem.maxSurvivorSpaceInBYtes":17432576,"jvm.mem.maxYoungGenerationHeapInBytes":139591680,"jvm.mem.nonHeapCommittedInBytes":108519424,"jvm.mem.nonHeapUsedInBytes":100466784,"jvm.mem.usedOldGenerationHeapInBytes":127243224,"jvm.mem.usedSurvivorSpaceInBytes":94752,"jvm.mem.usedYoungGenerationHeapInBytes":97843912,"merges.currentActive":0,"merges.docsSegmentMerges":0,"merges.docsSegmentsMerging":0,"merges.mergedSegmentsInBytes":0,"merges.segmentMerges":0,"merges.sizeSegmentsMergingInBytes":0,"merges.totalSegmentMergingInMilliseconds":0,"node.hostname":"10.33.104.186","node.ipAddress":"10.33.104.186:9300","openFD":213,"queriesTotal":0,"refresh.total":0,"refresh.totalInMilliseconds":0,"searchFetchCurrentlyRunning":0,"searchFetches":0,"sizeStoreInBytes":0,"threadpool.bulk.Aueue":234,"threadpool.bulkActive":3,"threadpool.bulkRejected":2,"threadpool.bulkThreads":23,"threadpool.fetchShardStartedQueue":0,"threadpool.fetchShardStartedRejected":0,"threadpool.fetchShardStartedThreads":0,"threadpool.fetchShardStoreActive":0,"threadpool.fetchShardStoreQueue":0,"threadpool.fetchShardStoreRejected":0,"threadpool.fetchShardStoreThreads":0,"threadpool.flushActive":0,"threadpool.flushQueue":0,"threadpool.flushRejected":0,"threadpool.flushThreads":0,"threadpool.forceMergeActive":0,"threadpool.forceMergeQueue":0,"threadpool.forceMergeRejected":0,"threadpool.forceMergeThreads":0,"threadpool.genericActive":0,"threadpool.genericQueue":0,"threadpool.genericRejected":0,"threadpool.genericThreads":5,"threadpool.getActive":0,"threadpool.getQueue":0,"threadpool.getRejected":0,"threadpool.getThreads":0,"threadpool.indexActive":0,"threadpool.indexQueue":0,"threadpool.indexRejected":0,"threadpool.indexThreads":0,"threadpool.listenerActive":0,"threadpool.listenerQueue":0,"threadpool.listenerRejected":0,"threadpool.listenerThreads":0,"threadpool.managementActive":1,"threadpool.managementQueue":0,"threadpool.managementRejected":0,"threadpool.managementThreads":3,"threadpool.mergeActive":3,"threadpool.mergeQueue":39,"threadpool.mergeRejected":837,"threadpool.mergeThreads":9,"threadpool.percolateActive":8,"threadpool.percolateQueue":78,"threadpool.percolateRejected":8,"threadpool.percolateThreads":9,"threadpool.refreshActive":0,"threadpool.refreshQueue":0,"threadpool.refreshRejected":0,"threadpool.refreshThreads":0,"threadpool.searchActive":0,"threadpool.searchQueue":0,"threadpool.searchRejected":0,"threadpool.searchThreads":0,"threadpool.snapshotActive":0,"threadpool.snapshotQueue":0,"threadpool.snapshotRejected":0,"threadpool.snapshotThreads":0,"threadpoolActivefetchShardStarted":0,"transport.connectionsOpened":0,"transport.packetsReceived":20,"transport.packetsReceivedInBytes":11691,"transport.packetsSent":20,"transport.packetsSentInBytes":11691}

0 comments on commit 7baf55c

Please sign in to comment.