From 2b7bab9f4a161286e27a1041fe1ff461262a4517 Mon Sep 17 00:00:00 2001 From: RandellP Date: Fri, 7 Feb 2020 11:48:23 -0800 Subject: [PATCH] (SLV-767) Updated measurement tagging Fixed regex that looked for puppet_server instead of puppetserver Added regex's for bolt and ace This means all of the services consistently get replaced and tagged instead of just some. removed the gc-stats regex as it wasn't used and was making it harder to make graphs using it. --- files/json2timeseriesdb | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/files/json2timeseriesdb b/files/json2timeseriesdb index ccf09975..65e82919 100755 --- a/files/json2timeseriesdb +++ b/files/json2timeseriesdb @@ -215,9 +215,9 @@ def influx_tag_parser(tag) tag.delete('orchestrator') end - if tag.include? 'puppet_server' - tag_set = "#{tag_set}service=puppet_server," - tag.delete('puppet_server') + if tag.include? 'puppetserver' + tag_set = "#{tag_set}service=puppetserver," + tag.delete('puppetserver') end if tag.include? 'puppetdb' @@ -225,12 +225,14 @@ def influx_tag_parser(tag) tag.delete('puppetdb') end - if tag.include? 'gc-stats' - n = tag.index 'gc-stats' - gcstats_name = tag[n.to_i + 1] - tag_set = "#{tag_set}gc-stats=#{gcstats_name}," - tag.delete_at(tag.index('gc-stats') + 1) - tag.delete('gc-stats') + if tag.include? 'ace' + tag_set = "#{tag_set}service=ace," + tag.delete('ace') + end + + if tag.include? 'bolt' + tag_set = "#{tag_set}service=bolt," + tag.delete('bolt') end if tag.include? 'broker-service'