@theotherwillembotha/node-red-plugincore 0.0.50 → 0.0.52

package/build/core/logger/node/RestLoggerConfigNode.html

@@ -6,8 +6,8 @@
         .addDefault("level", {value:"info", required:true})
 
         // platform rest:
-        .addDefault("est_url", {})
-        .addDefault("est_ignoresslerror", {})
+        .addDefault("rest_url", {})
+        .addDefault("rest_ignoresslerror", {})
         .addDefault("rest_auth_type", {})
         .addDefault("rest_auth_basic_username", {})
         .addDefault("rest_auth_basic_password", {})
@@ -88,122 +88,96 @@
 <script type="text/html" template-section="onIncludeEditForm">
 <div id="LoggerConfig">
     <div class="form-row">
-        <label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
+        <label class="towb_editorlabel" for="node-config-input-name"><i class="fa fa-font"></i> Name</label>
         <input type="text" id="node-config-input-name" />
     </div>
 
     <div class="form-row">
-        <label for="node-config-input-level"><i class="fa fa-tag"></i> Level</label>
+        <label class="towb_editorlabel" for="node-config-input-level"><i class="fa fa-signal"></i> Level</label>
         <input type="text" id="node-config-input-level" />
     </div>
 
     <div class="platform platform-rest">
         <div class="form-row">
-            <label for="node-config-input-rest_url"><i class="fa fa-tag"></i> URL</label>
+            <label class="towb_editorlabel" for="node-config-input-rest_url"><i class="fa fa-link"></i> URL</label>
             <input class="platform-rest-input required" type="text" id="node-config-input-rest_url" />
         </div>
         <div class="form-row">
-            <label></label>
+            <label class="towb_editorlabel"></label>
             <input type="checkbox" id="node-config-input-rest_ignoresslerror" style="width:20px; margin-right:5px;" />
             <label style="width:auto" for="node-config-input-rest_ignoresslerror"><span>Ignore Invalid SSL certificates</span></label>
         </div>
         <div class="form-row">
-            <label for="node-config-input-rest_auth_type"><i class="fa fa-tag"></i> Authentication</label>
+            <label class="towb_editorlabel" for="node-config-input-rest_auth_type"><i class="fa fa-lock"></i> Authentication</label>
             <input class="platform-rest-input required" type="text" id="node-config-input-rest_auth_type" />
         </div>
         <div class="form-row platform-rest-auth auth-basic">
-            <label for="node-config-input-rest_auth_basic_username"><i class="fa fa-tag"></i> Username</label>
+            <label class="towb_editorlabel" for="node-config-input-rest_auth_basic_username"><i class="fa fa-user"></i> Username</label>
             <input class="platform-rest-input" type="text" id="node-config-input-rest_auth_basic_username" />
         </div>
         <div class="form-row platform-rest-auth auth-basic">
-            <label for="node-config-input-rest_auth_basic_password"><i class="fa fa-tag"></i> Password</label>
+            <label class="towb_editorlabel" for="node-config-input-rest_auth_basic_password"><i class="fa fa-key"></i> Password</label>
             <input class="platform-rest-input" type="password" id="node-config-input-rest_auth_basic_password" />
         </div>
         <div class="form-row platform-rest-auth auth-apikey">
-            <label for="node-config-input-rest_auth_apikey_mechanism"><i class="fa fa-tag"></i> Mechanism</label>
+            <label class="towb_editorlabel" for="node-config-input-rest_auth_apikey_mechanism"><i class="fa fa-exchange"></i> Mechanism</label>
             <input class="platform-rest-input" type="text" id="node-config-input-rest_auth_apikey_mechanism" />
         </div>
         <div class="form-row platform-rest-auth auth-apikey">
-            <label for="node-config-input-rest_auth_apikey_name"><i class="fa fa-tag"></i> APIKey name</label>
+            <label class="towb_editorlabel" for="node-config-input-rest_auth_apikey_name"><i class="fa fa-id-badge"></i> APIKey name</label>
             <input class="platform-rest-input" type="text" id="node-config-input-rest_auth_apikey_name" />
         </div>
         <div class="form-row platform-rest-auth auth-apikey">
-            <label for="node-config-input-rest_auth_apikey_value"><i class="fa fa-tag"></i> APIKey value</label>
+            <label class="towb_editorlabel" for="node-config-input-rest_auth_apikey_value"><i class="fa fa-lock"></i> APIKey value</label>
             <input class="platform-rest-input" type="text" id="node-config-input-rest_auth_apikey_value" />
         </div>
     </div>
 
     <div class="form-row">
-        <label for="node-config-input-templateEditor"><i class="fa fa-tag"></i> Template</label>
+        <label class="towb_editorlabel" for="node-config-input-templateEditor"><i class="fa fa-code"></i> Template</label>
         <div style="height: 250px; min-height:150px;" class="node-text-editor" id="node-config-input-templateEditor"></div>
     </div>
 </div>
 </script>
 
 <script type="text/markdown" template-section="onIncludeDocumentation">
-Configuration node for the Logger Integration
-
-## Inputs
-: *name*    (string)    : The common name for the logger Configuration
-: *level*   (level)     : The logging level - debug, info, warning, error
-: *platform*(string)    : The common name for the logger Configuration
-: *template*(mustache)  : A template for the log messages.
-
-## Logger platform
-Currently supported logging platforms
-
-### Console
-The log message will be printed out to stdio
-
-### Http / Https
-Publish the message to an http endpoint using a http / https POST command.
-
-: *url*                 (url)           : The endpoint for the url where requests are to be posted to.
-: *ignore ssl errors*   (boolean)       : If enabled, the invalid ssl certificates will be ignored.
-: *authentication*      (auth method)   : what auth method should be used for the http request. (none, basic, api key)
-
-#### Authentication
-##### Basic
-Provides basic authentication using the Authorization header 
-
-: *username*    (string) : the username used for basic authentication
-: *password*    (string) : the password used for basic authentication
-
-##### APIKey
-Provides authentication using a matrix parameter, header or query parameter and an apikey
-
-: *mechanism*   (mechanism) : the mechanism that will be used for transmitting the key (header, queryparam, matrixparam)
-: *apikey name* (string)    : the name of the key used for api authentication. (path variable or query param name)
-: *apikey value*(string)    : the value of the api key that will be transmitted. (beware of special characters)
-
-### Loki
-Publish the message to a loki endpoint.
-
-: *host*        (string) : the host and port\ of the loki instance that it being logged to
-: *tenant*      (string) : the tenant id that will be used to log to
-: *username*    (string) : the username for the loki instance.
-: *authtoken*   (string) : the authtoken for the loki instance.
-
-# Mustache Templating
-Mustache / Handlebars are used for building up the logged message payloads that are sent to the logging backend.
-The resultant message will be interpreted as a string, meaning care should be taken in the event that a string representation of a json object is built.
-
-### Provided Properties
-A couple of values are provided to the logging context by default.
-
-: *msg*         (object)    : an object containing the payload or message that should be parsed through the template.
-: *currentTime* (object)    : a string containing the current time in ISO8601 format
-
-### Mustache Helpers
-In addition to the provided properties, some "helpers" have also been provided to assist in serialization.
-
-: *json*        (helper)    : converts a json object to a string using the JSON.stringify method.
-
-## Examples
-- {{{json msg}}} - serializes the the msg object to json format.
-
-# References
-- [Mustache - Wikipedia](https://en.wikipedia.org/wiki/Mustache_(template_system))
-- [Mustache - Playground](https://jgonggrijp.gitlab.io/wontache/playground.html)
+Posts log messages to an HTTP or HTTPS endpoint as a JSON payload.
+
+### Properties
+: *name*        (string)    : A descriptive name for this logger configuration.
+: *level*       (level)     : The minimum log level. Messages below this threshold are suppressed. Options: DEBUG, INFO, WARNING, ERROR.
+: *url*         (url)       : The endpoint that log messages will be POSTed to.
+: *ignore SSL errors* (boolean) : When enabled, invalid SSL certificates are accepted.
+: *authentication* (select) : The authentication strategy applied to each request. Options: None, Basic, ApiKey.
+: *template*    (mustache)  : A Mustache/Handlebars template that formats the log message body.
+
+### Authentication
+#### Basic
+Authenticates using the HTTP `Authorization` header (RFC 7617).
+: *username*    (string)    : The username credential.
+: *password*    (string)    : The password credential.
+
+#### ApiKey
+Authenticates by injecting a key/value pair into the request.
+: *mechanism*   (select)    : Where the key is injected — Header, Query Param, or Matrix Param.
+: *APIKey name* (string)    : The name of the key (e.g. `x-api-key`).
+: *APIKey value* (string)   : The value of the key.
+
+### Mustache Templating
+Mustache/Handlebars templates build the message string POSTed to the endpoint.
+
+#### Provided Properties
+: *msg*         (object)    : The Node-RED message object passed through the node.
+: *currentTime* (string)    : The current time in ISO 8601 format.
+
+#### Helpers
+: *json*        (helper)    : Serialises an object to a JSON string using `JSON.stringify`.
+
+#### Examples
+- `{{{json msg}}}` — serialises the full message object as JSON.
+
+#### References
+- [Mustache — Wikipedia](https://en.wikipedia.org/wiki/Mustache_(template_system))
+- [Mustache — Playground](https://jgonggrijp.gitlab.io/wontache/playground.html)
 </script>
 

package/build/core/logger/node/RestLoggerConfigNode.js

@@ -46,7 +46,7 @@ exports.RestLoggerConfigNode = RestLoggerConfigNode;
 exports.RestLoggerConfigNode = RestLoggerConfigNode = __decorate([
     (0, NodeDescriptionDecorator_1.NodeDescription)({
         id: "RestLoggerConfigNode",
-        name: "Console Logger",
+        name: "Rest Endpoint Logger",
         group: "config",
         sourceFile: NodeGenerator_1.SourceUtility.getSourcePath("/build/", "/src/") + "RestLoggerConfigNode.html",
         package: "@theotherwillembotha/node-red-plugincore",

package/build/core/logger/service/LoggerService.d.ts

@@ -52,7 +52,7 @@ export interface LokiLoggerConfig extends BaseLoggerConfig {
     host: string;
     userid?: string;
     authtoken?: string;
-    tenantID?: string;
+    tenantid?: string;
 }
 export interface RestLoggerConfig extends BaseLoggerConfig {
     type: PlatformType.rest;

package/build/core/logger/service/LoggerService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LoggerService.d.ts","sourceRoot":"","sources":["../../../../src/core/logger/service/LoggerService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LoggerService.d.ts","sourceRoot":"","sources":["../../../../src/core/logger/service/LoggerService.ts"],"names":[],"mappings":"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"}

package/build/core/logger/service/LoggerService.js

@@ -9,7 +9,6 @@ const handlebars_1 = __importDefault(require("handlebars"));
 const winston_1 = require("winston");
 const winston_loki_1 = __importDefault(require("winston-loki"));
 const whatwg_url_1 = require("whatwg-url");
-const LoggerConfigNode_1 = require("../node/LoggerConfigNode");
 const LoggerTemplate_1 = require("../template/LoggerTemplate");
 var network = require('network');
 const deep_equal_1 = __importDefault(require("deep-equal"));
@@ -94,7 +93,7 @@ class LokiLogger extends NewLogger {
             json: true,
             format: winston_1.format.json(),
             headers: {
-                "X-Scope-OrgID": (config.tenantID) ? config.tenantID : undefined
+                "X-Scope-OrgID": (config.tenantid) ? config.tenantid : undefined
             },
             replaceTimestamp: true,
             onConnectionError: (err) => console.error(err),
@@ -197,7 +196,7 @@ class LoggerService extends NodeConstructor_1.BaseService {
         return logger;
     }
     static getServiceDescriptor() {
-        return new NodeConstructor_1.ServiceDescriptor("@theotherwillembotha/loggerservice", "LoggerService", "services-plugin", "@theotherwillembotha/node-red-plugincore", LoggerService, [LoggerConfigNode_1.LoggerConfigNode, LoggerTemplate_1.LoggerTemplate]);
+        return new NodeConstructor_1.ServiceDescriptor("@theotherwillembotha/loggerservice", "LoggerService", "services-plugin", "@theotherwillembotha/node-red-plugincore", LoggerService, [LoggerTemplate_1.LoggerTemplate]);
     }
 }
 exports.LoggerService = LoggerService;

package/build/core/logger/template/LoggerTemplate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LoggerTemplate.d.ts","sourceRoot":"","sources":["../../../../src/core/logger/template/LoggerTemplate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAGpF,MAAM,WAAW,oBAAqB,SAAQ,cAAc;IACxD,UAAU,EAAC,OAAO,CAAC;IACnB,MAAM,EAAC,MAAM,CAAC;IACd,0BAA0B,EAAC,OAAO,CAAC;IACnC,mBAAmB,EAAC,MAAM,CAAC;CAC9B;AAED,qBAAa,cAAe,SAAQ,QAAQ;IAGxC,MAAM,CAAC,qBAAqB,IAAI,kBAAkB;CAQrD"}
+{"version":3,"file":"LoggerTemplate.d.ts","sourceRoot":"","sources":["../../../../src/core/logger/template/LoggerTemplate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAEpF,MAAM,WAAW,oBAAqB,SAAQ,cAAc;IACxD,UAAU,EAAC,OAAO,CAAC;IACnB,MAAM,EAAC,MAAM,CAAC;IACd,0BAA0B,EAAC,OAAO,CAAC;IACnC,mBAAmB,EAAC,MAAM,CAAC;CAC9B;AAED,qBAAa,cAAe,SAAQ,QAAQ;IAGxC,MAAM,CAAC,qBAAqB,IAAI,kBAAkB;CAQrD"}

package/build/core/logger/template/LoggerTemplate.html

@@ -102,7 +102,7 @@
 <script type="text/javascript" template-section="onCompose">
     node
         .addDefault("logEnabled", { value:false, required:true})
-        .addDefault("logger", { required:false})
+        .addDefault("logger", { required:false, value:'', type:"DelegatedConfigReferenceNode"})
         .addDefault("logTemplateOverrideEnabled",  {value:false})
         .addDefault("logTemplateOverride", {value:"message:{{msg}}"})
 </script>
@@ -186,7 +186,7 @@
         value: node.logTemplateOverride
     });
 
-    let loggerSelector = $("#{{defaults.logger}}");
+    let loggerSelector = $("#logger-selector");
     let loggerEditButton = $("#logger-edit-btn");
     let loggerAddButton = $("#logger-add-btn");
 
@@ -199,7 +199,7 @@
 
         // figure out what type of logger this is.
         let selectedLogger = (await getLoggers()).find(logger => logger.id === loggerSelector.val());
-        RED.editor.editConfig("#{{defaults.logger}}", selectedLogger.type, selectedLogger.id);
+        RED.editor.editConfig("#logger-selector", selectedLogger.type, selectedLogger.id);
     });
 
     loggerAddButton.on('click', function(event) {
@@ -223,14 +223,14 @@
                 .appendTo($dropdown);
             });
 
-            // Position it near the button
+            // Append first so outerWidth() is measurable, then position so the
+            // right edge of the dropdown aligns with the right edge of the button.
+            $('body').append($dropdown);
             $dropdown.css({
-                top:  $btn.offset().top + $btn.height(),
-                left: $btn.offset().left
+                top:  $btn.offset().top + $btn.outerHeight(),
+                left: $btn.offset().left + $btn.outerWidth() - $dropdown.outerWidth()
             });
 
-            $('body').append($dropdown);
-
             $(document).on('mousedown.dropdown', function(e) {
                 if (!$(e.target).closest('.loggertype-dropdown').length) {
                     $dropdown.remove();
@@ -247,7 +247,7 @@
                 // Do whatever you need with the selection
                 console.log('Selected:', selectedValue, selectedText);
                 $dropdown.remove();
-                RED.editor.editConfig("#{{defaults.logger}}", selectedValue, "_ADD_");
+                RED.editor.editConfig("#logger-selector", selectedValue, "_ADD_");
             });
         })
     });
@@ -265,12 +265,15 @@
     // lastly, make sure that we set the correct value on the logger selector.
     updateLoggerSelectorList().then(() => {
         loggerSelector.val(node.logger);
+        loggerSelector.trigger('change');
     });
 
 </script>
 
 <script type="text/javascript" template-section="onIncludeEditSave">
     node = this;
+    var selectedLogger = $("#logger-selector").val();
+    node.logger = (selectedLogger && selectedLogger !== "_ADD_") ? selectedLogger : '';
     node.logTemplateOverride = node.logTemplateOverrideEditor.getValue();
     node.logTemplateOverrideEditor.destroy();
     delete node.logTemplateOverrideEditor;
@@ -289,9 +292,9 @@
 
             <div id="section_logEnabled">
                 <div class="form-row nomargin">
-                    <label for="{{defaults.logger}}">Logger</label>
+                    <label for="logger-selector">Logger</label>
                     <div style="width: 70%; display: inline-flex;">
-                        <select id="{{defaults.logger}}" style="flex-grow: 1;" class="">
+                        <select id="logger-selector" style="flex-grow: 1;" class="">
                             <option value="_ADD_">none</option>
                         </select>
                         <a id="logger-edit-btn" class="red-ui-button disabled" style="margin-left: 10px;">
@@ -310,7 +313,7 @@
 
                 <div id="section_logTemplateOverrideEnabled">
                     <div class="form-row">
-                        <label for="node-input-logTemplateOverrideEditor"><i class="fa fa-tag"></i> Template</label>
+                        <label class="towb_editorlabel" for="node-input-logTemplateOverrideEditor"><i class="fa fa-code"></i> Template</label>
                         <div style="height: 250px; min-height:150px;" class="node-text-editor" id="node-input-logTemplateOverrideEditor"></div>
                     </div>
                 </div>

package/build/core/logger/template/LoggerTemplate.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoggerTemplate = void 0;
 const NodeGenerator_1 = require("../../NodeGenerator");
 const NodeConstructor_1 = require("../../NodeConstructor");
-const LoggerConfigNode_1 = require("../node/LoggerConfigNode");
 class LoggerTemplate extends NodeConstructor_1.Template {
     static getTemplateDescriptor() {
-        return new NodeConstructor_1.TemplateDescriptor("logger", LoggerTemplate, NodeGenerator_1.SourceUtility.getSourcePath("/build/", "/src/") + "LoggerTemplate.html", [LoggerConfigNode_1.LoggerConfigNode]);
+        return new NodeConstructor_1.TemplateDescriptor("logger", LoggerTemplate, NodeGenerator_1.SourceUtility.getSourcePath("/build/", "/src/") + "LoggerTemplate.html", []);
     }
 }
 exports.LoggerTemplate = LoggerTemplate;

package/build/core/metrics/MetricsDecorator.js

@@ -53,7 +53,7 @@ function Metrics(metricsConfig) {
                                 metricdescription: metricsConfig.description,
                                 node: nde
                             };
-                            this[valueSymbol] = _metrics.guage(gaugeConfig);
+                            this[valueSymbol] = _metrics.gauge(gaugeConfig);
                             return this[valueSymbol];
                         }
                         // timer metric.
@@ -126,7 +126,7 @@ function Metrics(metricsConfig) {
                                     metricdescription: metricsConfig.description,
                                     node: nde
                                 };
-                                this[valueSymbol] = _metrics.guage(gaugeConfig);
+                                this[valueSymbol] = _metrics.gauge(gaugeConfig);
                                 return this[valueSymbol];
                             }
                             // timer metric.

package/build/core/metrics/node/CounterMetricConfigNode.html

@@ -20,12 +20,12 @@
 <script type="text/html" template-section="onIncludeEditForm">
     <div id="MetricsConfig">
         <div class="form-row">
-            <label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
+            <label class="towb_editorlabel" for="node-config-input-name"><i class="fa fa-font"></i> Name</label>
             <input type="text" id="node-config-input-name" />
         </div>
 
         <div class="form-row">
-            <label for="node-config-input-description"><i class="fa fa-tag"></i> Description</label>
+            <label class="towb_editorlabel" for="node-config-input-description"><i class="fa fa-info-circle"></i> Description</label>
             <input type="text" id="node-config-input-description" />
         </div>
 

package/build/core/metrics/node/GaugeMetricConfigNode.html

@@ -20,12 +20,12 @@
 <script type="text/html" template-section="onIncludeEditForm">
     <div id="MetricsConfig">
         <div class="form-row">
-            <label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
+            <label class="towb_editorlabel" for="node-config-input-name"><i class="fa fa-font"></i> Name</label>
             <input type="text" id="node-config-input-name">
         </div>
 
         <div class="form-row">
-            <label for="node-config-input-description"><i class="fa fa-tag"></i> Description</label>
+            <label class="towb_editorlabel" for="node-config-input-description"><i class="fa fa-info-circle"></i> Description</label>
             <input type="text" id="node-config-input-description">
         </div>
 

package/build/core/metrics/node/GaugeMetricConfigNode.js

@@ -31,7 +31,7 @@ let GaugeMetricConfigNode = class GaugeMetricConfigNode extends NodeConstructor_
                 name: this.name()
             }
         };
-        this._gauge = this._metrics.guage(gaugeConfig);
+        this._gauge = this._metrics.gauge(gaugeConfig);
         if (config.reset) {
             _this._gauge.reset();
         }
@@ -47,7 +47,7 @@ exports.GaugeMetricConfigNode = GaugeMetricConfigNode;
 exports.GaugeMetricConfigNode = GaugeMetricConfigNode = __decorate([
     (0, NodeDescriptionDecorator_1.NodeDescription)({
         id: "GaugeMetricConfigNode",
-        name: "Guage Metric Config Node",
+        name: "Gauge Metric Config Node",
         group: "config",
         sourceFile: NodeGenerator_1.SourceUtility.getSourcePath("/build/", "/src/") + "GaugeMetricConfigNode.html",
         package: "@theotherwillembotha/node-red-plugincore",

package/build/core/metrics/node/MetricsConfigNode.html

@@ -8,7 +8,7 @@
 <script type="text/html" template-section="onIncludeEditForm">
     <div id="MetricsConfig">
         <div class="form-row">
-            <label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
+            <label class="towb_editorlabel" for="node-config-input-name"><i class="fa fa-font"></i> Name</label>
             <input type="text" id="node-config-input-name" />
         </div>
     </div>

package/build/core/metrics/node/TimerMetricConfigNode.html

@@ -88,23 +88,23 @@
 <script type="text/html" template-section="onIncludeEditForm">
     <div id="TimerMetricConfig">
         <div class="form-row">
-            <label class="towb_editorlabel" for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
+            <label class="towb_editorlabel" for="node-config-input-name"><i class="fa fa-font"></i> Name</label>
             <input type="text" id="node-config-input-name" />
         </div>
 
         <div class="form-row">
-            <label class="towb_editorlabel" for="node-config-input-description"><i class="fa fa-tag"></i> Description</label>
+            <label class="towb_editorlabel" for="node-config-input-description"><i class="fa fa-info-circle"></i> Description</label>
             <input type="text" id="node-config-input-description" />
         </div>
 
         <div class="form-row">
-            <label class="towb_editorlabel" for="node-config-input-metricType"><i class="fa fa-tag"></i> Type</label>
+            <label class="towb_editorlabel" for="node-config-input-metricType"><i class="fa fa-bar-chart"></i> Type</label>
             <input class="towb_editorfield" type="text" id="node-config-input-metricType" />
         </div>
 
         <div class="metrictype metrictype_histogram">
             <div class="form-row">
-                <label class="towb_editorlabel" for="node-config-input-buckettype"><i class="fa fa-tag"></i> Bucket Type</label>
+                <label class="towb_editorlabel" for="node-config-input-buckettype"><i class="fa fa-sliders"></i> Bucket Type</label>
                 <input class="towb_editorfield" type="text" id="node-config-input-buckettype" />
             </div>
 
@@ -114,37 +114,37 @@
 
             <div class="metricsconfig_buckets metricsconfig_buckets_manual">
                 <div class="form-row">
-                    <label class="towb_editorlabel" for="node-config-input-buckettype_manual_intervals"><i class="fa fa-tag"></i> Buckets</label>
+                    <label class="towb_editorlabel" for="node-config-input-buckettype_manual_intervals"><i class="fa fa-sliders"></i> Buckets</label>
                     <input type="text" id="node-config-input-buckettype_manual_intervals" placeholder="0.001, 0.01, 0.1, 1, 2, 5", value="0.001, 0.01, 0.1, 1, 2, 5"/>
                 </div>
             </div>
 
             <div class="metricsconfig_buckets metricsconfig_buckets_linear">
                 <div class="form-row">
-                    <label class="towb_editorlabel" for="node-config-input-buckettype_linear_start"><i class="fa fa-tag"></i> Start</label>
+                    <label class="towb_editorlabel" for="node-config-input-buckettype_linear_start"><i class="fa fa-sliders"></i> Start</label>
                     <input class="towb_editorfield_short" type="text" id="node-config-input-buckettype_linear_start" placeholder="0.000", value="0.000"/>
                 </div>
                 <div class="form-row">
-                    <label class="towb_editorlabel" for="node-config-input-buckettype_linear_inteval"><i class="fa fa-tag"></i> Interval</label>
+                    <label class="towb_editorlabel" for="node-config-input-buckettype_linear_interval"><i class="fa fa-sliders"></i> Interval</label>
                     <input class="towb_editorfield_short" type="text" id="node-config-input-buckettype_linear_interval" placeholder="10", value="10"/>
                 </div>
                 <div class="form-row">
-                    <label class="towb_editorlabel" for="node-config-input-buckettype_linear_count"><i class="fa fa-tag"></i> Count</label>
+                    <label class="towb_editorlabel" for="node-config-input-buckettype_linear_count"><i class="fa fa-sliders"></i> Count</label>
                     <input class="towb_editorfield_short" type="text" id="node-config-input-buckettype_linear_count" placeholder="10", value="10"/>
                 </div>
             </div>
 
             <div class="metricsconfig_buckets metricsconfig_buckets_exponential">
                 <div class="form-row">
-                    <label class="towb_editorlabel" for="node-config-input-buckettype_exponential_start"><i class="fa fa-tag"></i> Start</label>
+                    <label class="towb_editorlabel" for="node-config-input-buckettype_exponential_start"><i class="fa fa-sliders"></i> Start</label>
                     <input class="towb_editorfield_short" type="text" id="node-config-input-buckettype_exponential_start" placeholder="1", value="1"/>
                 </div>
                 <div class="form-row">
-                    <label class="towb_editorlabel" for="node-config-input-buckettype_exponential_factor"><i class="fa fa-tag"></i> Factor</label>
+                    <label class="towb_editorlabel" for="node-config-input-buckettype_exponential_factor"><i class="fa fa-sliders"></i> Factor</label>
                     <input class="towb_editorfield_short" type="text" id="node-config-input-buckettype_exponential_factor" placeholder="2", value="2"/>
                 </div>
                 <div class="form-row">
-                    <label class="towb_editorlabel" for="node-config-input-buckettype_exponential_count"><i class="fa fa-tag"></i> Count</label>
+                    <label class="towb_editorlabel" for="node-config-input-buckettype_exponential_count"><i class="fa fa-sliders"></i> Count</label>
                     <input class="towb_editorfield_short" type="text" id="node-config-input-buckettype_exponential_count" placeholder="10", value="10"/>
                 </div>
             </div>
@@ -152,7 +152,7 @@
 
         <div class="metrictype metrictype_summary">
             <div class="form-row">
-                <label class="towb_editorlabel" for="node-config-input-percentiletype"><i class="fa fa-tag"></i> Percentile Type</label>
+                <label class="towb_editorlabel" for="node-config-input-percentiletype"><i class="fa fa-sliders"></i> Percentile Type</label>
                 <input type="text" id="node-config-input-percentiletype" />
             </div>
 
@@ -162,7 +162,7 @@
 
             <div class="metricsconfig_percentiles metricsconfig_percentiles_manual">
                 <div class="form-row">
-                    <label class="towb_editorlabel" for="node-config-input-percentiletype_manual_intervals"><i class="fa fa-tag"></i> Percentiles</label>
+                    <label class="towb_editorlabel" for="node-config-input-percentiletype_manual_intervals"><i class="fa fa-sliders"></i> Percentiles</label>
                     <input class="towb_editorfield" type="text" id="node-config-input-percentiletype_manual_intervals" placeholder="0.01, 0.1, 0.9, 0.99", value="0.01, 0.1, 0.9, 0.99"/>
                 </div>
             </div>

package/build/core/metrics/service/MetricsService.d.ts

@@ -153,7 +153,7 @@ export declare class MetricsContainer {
     registry(): client.Registry;
     hasChanged(config: MetricsConfig): boolean;
     counter(config: CounterMetricConfig): CounterMetric;
-    guage(config: GaugeMetricConfig): GaugeMetric;
+    gauge(config: GaugeMetricConfig): GaugeMetric;
     histogram(config: HistogramMetricConfig): HistogramMetric;
     summary(config: SummaryMetricConfig): SummaryMetric;
 }

package/build/core/metrics/service/MetricsService.js

@@ -281,18 +281,18 @@ class MetricsContainer {
         }
         return counter;
     }
-    guage(config) {
-        var guageId = `gauge_${config.node.id}`;
-        var gauge = this.gauges[guageId];
+    gauge(config) {
+        var gaugeId = `gauge_${config.node.id}`;
+        var gauge = this.gauges[gaugeId];
         if (gauge) {
             // check if the config has changed much.
             if (!(0, deep_equal_1.default)(gauge.config(), config)) {
-                this._registry.removeSingleMetric(guageId);
-                this.gauges[guageId] = (gauge = new GaugeMetric(guageId, config, this._registry));
+                this._registry.removeSingleMetric(gaugeId);
+                this.gauges[gaugeId] = (gauge = new GaugeMetric(gaugeId, config, this._registry));
             }
         }
         else {
-            this.gauges[guageId] = (gauge = new GaugeMetric(guageId, config, this._registry));
+            this.gauges[gaugeId] = (gauge = new GaugeMetric(gaugeId, config, this._registry));
         }
         return gauge;
     }

package/build/core/metrics/template/CounterMetricTemplate.html

@@ -28,7 +28,7 @@
     <!-- CounterMetric -->
     <div id="section_countermetricconfig">
         <div class="form-row">
-            <label for="node-input-counterConfig"><i class="fa fa-tag"></i> Counter</label>
+            <label class="towb_editorlabel" for="node-input-counterConfig"><i class="fa fa-bar-chart"></i> Counter</label>
             <input type="text" id="node-input-counterConfig" />
         </div>
     </div>

package/build/core/metrics/template/GaugeMetricTemplate.html

@@ -27,7 +27,7 @@
     <!-- GaugeMetric -->
     <div id="section_gaugemetricconfig">
         <div class="form-row">
-            <label for="node-input-gaugeConfig"><i class="fa fa-tag"></i> Gauge</label>
+            <label class="towb_editorlabel" for="node-input-gaugeConfig"><i class="fa fa-bar-chart"></i> Gauge</label>
             <input type="text" id="node-input-gaugeConfig" />
         </div>
     </div>

package/build/core/metrics/template/TimerMetricTemplate.html

@@ -27,7 +27,7 @@
 
     <div id="section_timermetricconfig">
         <div class="form-row">
-            <label for="node-input-timerConfig"><i class="fa fa-tag"></i> Timer</label>
+            <label class="towb_editorlabel" for="node-input-timerConfig"><i class="fa fa-clock-o"></i> Timer</label>
             <input type="text" id="node-input-timerConfig" />
         </div>
     </div>