@nsshunt/stsappframework 3.1.45 → 3.1.47

package/dist/influxdb/influxDBManagerService.js

@@ -7,115 +7,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InfluxDBManagerService = void 0;
-/*
-option task = {
-  name: "task-sts-service-stats",
-  every: 1s,
-}
-
-data =
-    from(bucket: "TestBucket01")
-        |> range(start: -5s)
-        |> last()
-        |> filter(fn: (r) => r["_measurement"] == "service" and r["_field"] != "memory")
-
-r1 =
-    data
-        |> filter(fn: (r) => r["_field"] == "requestCount"
-        or r["_field"] == "errorCount"
-        or r["_field"] == "retryCount"
-        or r["_field"] == "authenticationCount"
-        or r["_field"] == "authenticationErrorCount"
-        or r["_field"] == "authenticationRetryCount"
-        or r["_field"] == "activeRequestCount"
-        or r["_field"] == "connectionCount"
-        or r["_field"] == "connectionPoolCount"
-        or r["_field"] == "connectionIdleCount"
-        or r["_field"] == "connectionWaitingCount"
-        or r["_field"] == "coreCount"
-        or r["_field"] == "cpu"
-        or r["_field"] == "systemcpu"
-        or r["_field"] == "velocity"
-        or r["_field"] == "timer"
-        or r["_field"] == "rx"
-        or r["_field"] == "tx")
-        |> group(columns: ["serviceId", "serviceInstanceId", "serviceInstanceProcessId", "_field"])
-
-r2 =
-    data
-        |> filter(
-            fn: (r) =>
-                float(v: r["_value"]) > 0.0 and (r["_field"] == "duration" or r["_field"]
-                        ==
-                        "latency"),
-        )
-        |> group(columns: ["serviceId", "serviceInstanceId", "serviceInstanceProcessId", "_field"])
-
-serviceInstanceProcessSum =
-    r1
-        |> sum()
-        |> toFloat()
-
-serviceInstanceProcessMean =
-    r2
-        |> mean()
-        |> toFloat()
-
-union(tables: [serviceInstanceProcessSum, serviceInstanceProcessMean])
-    |> map(fn: (r) => ({r with _time: now(), _measurement: "sts-stats-by-serviceinstanceprocess"}))
-    |> to(org: "my-org", bucket: "TestBucket01")
-
-serviceInstanceSum =
-    r1
-        |> group(columns: ["serviceId", "serviceInstanceId", "_field"])
-        |> sum()
-        |> toFloat()
-
-serviceInstanceMean =
-    r2
-        |> group(columns: ["serviceId", "serviceInstanceId", "_field"])
-        |> mean()
-        |> toFloat()
-
-union(tables: [serviceInstanceSum, serviceInstanceMean])
-    |> map(fn: (r) => ({r with _time: now(), _measurement: "sts-stats-by-serviceinstance"}))
-    |> to(org: "my-org", bucket: "TestBucket01")
-
-serviceSum =
-    r1
-        |> group(columns: ["serviceId", "_field"])
-        |> sum()
-        |> toFloat()
-
-serviceMean =
-    r2
-        |> group(columns: ["serviceId", "_field"])
-        |> mean()
-        |> toFloat()
-
-union(tables: [serviceSum, serviceMean])
-    |> map(fn: (r) => ({r with _time: now(), _measurement: "sts-stats-by-service"}))
-    |> to(org: "my-org", bucket: "TestBucket01")
-
-globalServiceSum =
-    r1
-        |> group(columns: ["_field"])
-        |> sum()
-        |> toFloat()
-
-globalServiceMean =
-    r2
-        |> group(columns: ["_field"])
-        |> mean()
-        |> toFloat()
-
-union(tables: [globalServiceSum, globalServiceMean])
-    |> map(fn: (r) => ({r with _time: now(), _measurement: "sts-stats-globalservice"}))
-    |> to(org: "my-org", bucket: "TestBucket01")
-
-*/
-const influxdb_client_1 = require("@influxdata/influxdb-client");
-const stsinstrumentation_1 = require("@nsshunt/stsinstrumentation");
 const influxDBManagerBase_1 = require("./influxDBManagerBase");
 const chalk_1 = __importDefault(require("chalk"));
 const _logPrefix = 'InfluxDBManagerService:';
@@ -302,69 +193,6 @@ data
             data: retVal
         };
     }
-    // Write data points ----------------------------------------------------------------------------------------------
-    // Agent context payload
-    // {"nid":"somehost@e58f5d75-6ff6-4e04-92a4-f2bcd722fec0-someuseragent|MainProcess|0","id":"somehost@e58f5d75-6ff6-4e04-92a4-f2bcd722fec0-someuseragent|MainProcess|0","hostName":"somehost","agentName":"e58f5d75-6ff6-4e04-92a4-f2bcd722fec0-someuseragent","threadId":"MainProcess","asyncRunnerId":"0"}
-    async OutputInfluxDB(writeApi, instrumentPayload) {
-        if (writeApi) {
-            try {
-                if (this.shuttingDown) {
-                    return false;
-                }
-                const { serviceId, serviceInstanceId, hostName, serviceInstanceProcessId, pid, ppid, serviceName, serviceVersion } = instrumentPayload.context;
-                let systemcpu = 0.0;
-                if (instrumentPayload.instruments[stsinstrumentation_1.Gauge.CPU_SYSTEM_LOAD_GAUGE]) {
-                    systemcpu = instrumentPayload.instruments[stsinstrumentation_1.Gauge.CPU_SYSTEM_LOAD_GAUGE].val;
-                }
-                const point = new influxdb_client_1.Point('all')
-                    .measurement('service')
-                    // Context settings
-                    .tag('serviceId', serviceId)
-                    .tag('serviceName', serviceName)
-                    .tag('serviceVersion', serviceVersion)
-                    .tag('serviceInstanceId', serviceInstanceId)
-                    .tag('serviceInstanceProcessId', serviceInstanceProcessId)
-                    .tag('hostName', hostName)
-                    .tag('pid', pid.toString())
-                    .tag('ppid', ppid.toString())
-                    // Data fields
-                    .intField('requestCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.REQUEST_COUNT_GAUGE].val)
-                    .intField('errorCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.ERROR_COUNT_GAUGE].val)
-                    .intField('retryCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.RETRY_COUNT_GAUGE].val)
-                    .intField('authenticationCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.AUTHENTICATION_COUNT_GAUGE].val)
-                    .intField('authenticationErrorCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE].val)
-                    .intField('authenticationRetryCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.AUTHENTICATION_RETRY_COUNT_GAUGE].val)
-                    .floatField('velocity', instrumentPayload.instruments[stsinstrumentation_1.Gauge.VELOCITY_GAUGE].va) // Note: Using va not val here
-                    .floatField('cpu', instrumentPayload.instruments[stsinstrumentation_1.Gauge.CPU_LOAD_GAUGE].val)
-                    .intField('activeRequestCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.ACTIVE_REQUEST_GAUGE].val)
-                    .intField('connectionCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.CONNECTION_COUNT_GAUGE].val)
-                    .intField('connectionPoolCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.CONNECTION_POOL_TOTAL_GAUGE].val)
-                    .intField('connectionIdleCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.CONNECTION_POOL_IDLE_GAUGE].val)
-                    .intField('connectionWaitingCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.CONNECTION_POOL_WAITING_GAUGE].val)
-                    .intField('coreCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.CORE_COUNT_GAUGE].val)
-                    //.intField('rx', instrumentPayload.instruments[Gauge.NETWORK_RX_GAUGE].val)
-                    //.intField('tx', instrumentPayload.instruments[Gauge.NETWORK_TX_GAUGE].val)
-                    .floatField('rx', instrumentPayload.instruments[stsinstrumentation_1.Gauge.NETWORK_RX_GAUGE].va) // Note: Using va not val here
-                    .floatField('tx', instrumentPayload.instruments[stsinstrumentation_1.Gauge.NETWORK_TX_GAUGE].va) // Note: Using va not val here
-                    .floatField('timer', instrumentPayload.instruments[stsinstrumentation_1.Gauge.TIMER_GAUGE].val)
-                    .floatField('duration', instrumentPayload.instruments[stsinstrumentation_1.Gauge.DURATION_GAUGE].val)
-                    .floatField('latency', instrumentPayload.instruments[stsinstrumentation_1.Gauge.LATENCY_GAUGE].val)
-                    .floatField('systemcpu', systemcpu)
-                    .stringField('memory', JSON.stringify(instrumentPayload.instruments[stsinstrumentation_1.Gauge.OBJECT_GAUGE].val));
-                writeApi.writePoint(point);
-                return true;
-            }
-            catch (error) {
-                this.#LogErrorMessage(chalk_1.default.red(`${_logPrefix}OutputInfluxDB: Could not write data point: [${error}]`));
-                this.#LogErrorMessage(chalk_1.default.red(`${JSON.stringify(instrumentPayload.context)}`));
-                return false;
-            }
-        }
-        else {
-            this.#LogErrorMessage(chalk_1.default.red(`${_logPrefix}OutputInfluxDBService: Could not write data point as writeClient is null`));
-            return false;
-        }
-    }
 }
 exports.InfluxDBManagerService = InfluxDBManagerService;
 //# sourceMappingURL=influxDBManagerService.js.map

package/dist/influxdb/influxDBManagerService.js.map

@@ -1 +1 @@
-{"version":3,"file":"influxDBManagerService.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"influxDBManagerService.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerService.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nsshunt/stsappframework",
-  "version": "3.1.45",
+  "version": "3.1.47",
   "description": "",
   "main": "dist/index.js",
   "types": "./types/index.d.ts",

package/src/globalServiceDefinitions.ts

@@ -0,0 +1,289 @@
+import { Gauge } from '@nsshunt/stsinstrumentation'
+import { ISTSLogger } from '@nsshunt/stsutils';
+import { SubscriptionTopic } from '@nsshunt/stssocketio-client'
+import { IContextBase, IServiceProcessContext } from '@nsshunt/stspublisherserver'
+
+export type IInstrumentHashMap = Record<string, string>;
+
+export interface ITimeSeriesEntry {
+    timestamp: number
+    value: number
+}
+
+export interface IHistoField {
+    label: string
+    bucketLimit: number
+}
+
+export enum influxDBDataType {
+    intField = 'intField',
+    floatField = 'floatField',
+    stringField = 'stringField'
+}
+
+export interface IFieldRecord {
+    fieldName: string
+    gauge: Gauge
+    instrumentProperty: string
+    dataType: string
+    influxdbDataType: influxDBDataType
+    timeSeriesIndex?: boolean
+    quantile?: boolean // Does this field require a quantile ?
+    histo?: IHistoField[]
+}
+
+export interface IRedisInstrumentProcessorBaseOptions {
+    logger: ISTSLogger
+}
+
+//@@ current not used - delete if required ...
+export interface IRedisQueryFilters {
+    level1ContextField: string
+    level2ContextField: string
+    level3ContextField: string
+}
+
+export interface IRedisIndexPrefixDefinitions {
+    timeSeriesIndex: string
+    timeSeriesPrefix: string
+    instantIndex: string
+    instantPrefix: string
+}
+
+export interface IsubscriptionTopic {
+    subscriptionTopic: SubscriptionTopic
+    route: string,
+}
+
+export interface IServiceDefinition {
+    influxDBContextTags: string[],
+    redisIndexPrefixDefinitions: IRedisIndexPrefixDefinitions
+    fieldList: IFieldRecord[] // Specific additional fields (beyond the core fields) that this service supports
+    GetPathFromContext: (context: IContextBase) => string
+    redisQueryFilters: IRedisQueryFilters
+    subscriptionTopics: IsubscriptionTopic[]
+}
+
+export interface IGlobalServiceDefinitions {
+    coreFieldList: IFieldRecord[] // Set of instruments that are used by all service types
+    services: Record<string, IServiceDefinition>;
+}
+
+/*
+AllServicesCombined = 'AllServicesCombined',
+Services = 'Services',
+ServiceInstances = 'ServiceInstances',
+ServiceInstance = 'ServiceInstance',
+
+// User Agents topics
+AllAgentsCombined = 'AllAgentsCombined',
+Agents = 'Agents',
+AgentWorkers = 'AgentWorkers',
+AgentWorker = 'AgentWorker',
+
+// Lambda topics
+AllLambdasCombined = "AllLambdasCombined",
+LambdaTechnologies = "LambdaTechnologies", // e.g. aws     was lambdas
+LambdaSubTechnologies = "LambdaSubTechnologies", // e.g. aws_s3, aws_sqs, aws_sns          was LambdaInstances
+LambdaSubTechnologiesInstance = "LambdaSubTechnologiesInstance", // (uuidv4())           was ServiceInstance
+*/
+
+export const globalServiceDefinitions: IGlobalServiceDefinitions = {
+    coreFieldList: [
+        { fieldName: 'requestCount', gauge: Gauge.REQUEST_COUNT_GAUGE, instrumentProperty: 'val', dataType: 'number', influxdbDataType: influxDBDataType.intField },
+        { fieldName: 'errorCount', gauge: Gauge.ERROR_COUNT_GAUGE, instrumentProperty: 'val', dataType: 'number', influxdbDataType: influxDBDataType.intField },
+        { fieldName: 'retryCount', gauge: Gauge.RETRY_COUNT_GAUGE, instrumentProperty: 'val', dataType: 'number', influxdbDataType: influxDBDataType.intField },
+        { fieldName: 'authenticationCount', gauge: Gauge.AUTHENTICATION_COUNT_GAUGE, instrumentProperty: 'val', dataType: 'number', influxdbDataType: influxDBDataType.intField },
+        { fieldName: 'authenticationErrorCount', gauge: Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE, instrumentProperty: 'val', dataType: 'number', influxdbDataType: influxDBDataType.intField },
+        { fieldName: 'authenticationRetryCount', gauge: Gauge.AUTHENTICATION_RETRY_COUNT_GAUGE, instrumentProperty: 'val', dataType: 'number', influxdbDataType: influxDBDataType.intField },
+        { fieldName: 'velocity', gauge: Gauge.VELOCITY_GAUGE, instrumentProperty: 'va', dataType: 'number', influxdbDataType: influxDBDataType.floatField },
+        { fieldName: 'activeRequestCount', gauge: Gauge.ACTIVE_REQUEST_GAUGE, instrumentProperty: 'val', dataType: 'number', timeSeriesIndex: true, quantile: true, influxdbDataType: influxDBDataType.intField },
+        { fieldName: 'coreCount', gauge: Gauge.CORE_COUNT_GAUGE, instrumentProperty: 'val', dataType: 'number', influxdbDataType: influxDBDataType.intField },
+        { fieldName: 'rx', gauge: Gauge.NETWORK_RX_GAUGE, instrumentProperty: 'va', dataType: 'number', influxdbDataType: influxDBDataType.floatField },
+        { fieldName: 'tx', gauge: Gauge.NETWORK_TX_GAUGE, instrumentProperty: 'va', dataType: 'number', influxdbDataType: influxDBDataType.floatField },
+        { fieldName: 'timer', gauge: Gauge.TIMER_GAUGE, instrumentProperty: 'val', dataType: 'number', influxdbDataType: influxDBDataType.floatField },
+        { fieldName: 'duration', gauge: Gauge.DURATION_GAUGE, instrumentProperty: 'val', dataType: 'number', timeSeriesIndex: true, quantile: true, influxdbDataType: influxDBDataType.floatField,
+            histo: [
+                { label: 'B10', bucketLimit: 10 },
+                { label: 'B20', bucketLimit: 20 },
+                { label: 'B50', bucketLimit: 50 },
+                { label: 'B100', bucketLimit: 100 },
+                { label: 'B1000', bucketLimit: 1000 },
+                { label: 'B50000', bucketLimit: 50000 },
+                { label: 'BInfinity', bucketLimit: -1 }
+            ] },
+        { fieldName: 'latency', gauge: Gauge.LATENCY_GAUGE, instrumentProperty: 'val', dataType: 'number', timeSeriesIndex: true, quantile: true, influxdbDataType: influxDBDataType.floatField, 
+            histo: [
+                { label: 'B10', bucketLimit: 10 },
+                { label: 'B20', bucketLimit: 20 },
+                { label: 'B50', bucketLimit: 50 },
+                { label: 'B100', bucketLimit: 100 },
+                { label: 'B1000', bucketLimit: 1000 },
+                { label: 'B50000', bucketLimit: 50000 },
+                { label: 'BInfinity', bucketLimit: -1 }
+            ] }
+    ],
+    services: {
+        ['service']: {
+            influxDBContextTags: [
+                'serviceId',
+                'serviceName',
+                'serviceVersion',
+                'serviceInstanceId',
+                'serviceInstanceProcessId',
+                'hostName',
+                'pid',
+                'ppid'
+            ],
+            redisIndexPrefixDefinitions: {
+                timeSeriesIndex: 'idx:serviceIndexTimeSeries',
+                timeSeriesPrefix: '/serviceTimeSeries:',
+                instantIndex: 'idx:serviceIndexInstant',
+                instantPrefix: '/serviceInstant:'
+            },
+            fieldList: [
+                { fieldName: 'cpu', gauge: Gauge.CPU_LOAD_GAUGE, instrumentProperty: 'val', dataType: 'number', timeSeriesIndex: true, quantile: true, influxdbDataType: influxDBDataType.floatField },
+                { fieldName: 'connectionCount', gauge: Gauge.CONNECTION_COUNT_GAUGE, instrumentProperty: 'val', dataType: 'number', timeSeriesIndex: true, quantile: true, influxdbDataType: influxDBDataType.intField },
+                { fieldName: 'connectionPoolCount', gauge: Gauge.CONNECTION_POOL_TOTAL_GAUGE, instrumentProperty: 'val', dataType: 'number', influxdbDataType: influxDBDataType.intField },
+                { fieldName: 'connectionIdleCount', gauge: Gauge.CONNECTION_POOL_IDLE_GAUGE, instrumentProperty: 'val', dataType: 'number', influxdbDataType: influxDBDataType.intField },
+                { fieldName: 'connectionWaitingCount', gauge: Gauge.CONNECTION_POOL_WAITING_GAUGE, instrumentProperty: 'val', dataType: 'number', influxdbDataType: influxDBDataType.intField },
+                { fieldName: 'systemcpu', gauge: Gauge.CPU_SYSTEM_LOAD_GAUGE, instrumentProperty: 'val', dataType: 'number', timeSeriesIndex: true, quantile: true, influxdbDataType: influxDBDataType.floatField },
+                { fieldName: 'memory', gauge: Gauge.OBJECT_GAUGE, instrumentProperty: 'val', dataType: 'JSON', influxdbDataType: influxDBDataType.stringField }
+            ],
+            GetPathFromContext(context: IServiceProcessContext): string {
+                //const { serviceId, serviceInstanceId, hostName, serviceInstanceProcessId, 
+                //pid, ppid, serviceName, serviceVersion } = instrumentPayload.context;
+                const { serviceId, serviceInstanceId, serviceInstanceProcessId } = context;
+                return `/${serviceId}/${serviceInstanceId}/${serviceInstanceProcessId}`; //@@ these should line up with the query filer names
+            },
+            redisQueryFilters: {
+                level1ContextField: 'serviceType',
+                level2ContextField: 'appid',
+                level3ContextField: 'appinstanceid'
+            },
+            subscriptionTopics: [
+                {
+                    subscriptionTopic: SubscriptionTopic.AllServicesCombined,
+                    route: '/metrics'
+                },
+                {
+                    subscriptionTopic: SubscriptionTopic.Services,
+                    route: '/metrics/services'
+                },
+                {
+                    subscriptionTopic: SubscriptionTopic.ServiceInstances,
+                    route: '/metrics/services/:key'
+                },
+                {
+                    subscriptionTopic: SubscriptionTopic.ServiceInstance,
+                    route: '/metrics/services/:key/:subkey'
+                }
+            ]
+        },
+        ['agent']: {
+            influxDBContextTags: [
+                'id',
+                'hostName',
+                'agentName',
+                'threadId',
+                'asyncRunnerId'
+            ],
+            redisIndexPrefixDefinitions: {
+                timeSeriesIndex: 'idx:agentIndexTimeSeries',
+                timeSeriesPrefix: '/agentTimeSeries:',
+                instantIndex: 'idx:agentIndexInstant',
+                instantPrefix: '/agentInstant:'
+            },
+            fieldList: [
+                { fieldName: 'childCount', gauge: Gauge.CHILD_COUNT, instrumentProperty: 'val', dataType: 'number', influxdbDataType: influxDBDataType.intField }
+            ],
+            //@@ need type declare in appframework ?? agent does not use appframework ... perhaps stspublisher
+            GetPathFromContext(context: IContextBase): string {
+                //const { nid, id, hostName, agentName, threadId, asyncRunnerId } = context;
+                const { agentName, threadId, asyncRunnerId } = context;
+                return `/${agentName}/${threadId}/${asyncRunnerId}`; //@@ these should line up with the query filer names
+            },
+            redisQueryFilters: {
+                level1ContextField: 'serviceType',
+                level2ContextField: 'appid', //@@ this should be named something else
+                level3ContextField: 'appinstanceid' //@@ this should be named something else
+            },
+            subscriptionTopics: [
+                {
+                    subscriptionTopic: SubscriptionTopic.AllAgentsCombined,
+                    route: '/metrics'
+                },
+                {
+                    subscriptionTopic: SubscriptionTopic.Agents,
+                    route: '/metrics/agents'
+                },
+                {
+                    subscriptionTopic: SubscriptionTopic.AgentWorkers,
+                    route: '/metrics/agents/:key'
+                },
+                {
+                    subscriptionTopic: SubscriptionTopic.AgentWorker,
+                    route: '/metrics/agents/:key/:subkey'
+                }
+            ]
+        },
+        ['lambda']: {
+            influxDBContextTags: [
+                'technology',
+                'subTechnology',
+                'lambdaFunctionName',
+                'lambdaInstance',
+                'hostName',
+                'processId',
+                'parentProcessId',
+                'useCase',
+                'pattern'
+            ],
+            redisIndexPrefixDefinitions: {
+                timeSeriesIndex: 'idx:lambdaIndexTimeSeries',
+                timeSeriesPrefix: '/lambdaTimeSeries:',
+                instantIndex: 'idx:lambdaIndexInstant',
+                instantPrefix: '/lambdaInstant:'
+            },
+            fieldList: [
+                { fieldName: 'cpu', gauge: Gauge.CPU_LOAD_GAUGE, instrumentProperty: 'val', dataType: 'number', timeSeriesIndex: true, quantile: true, influxdbDataType: influxDBDataType.floatField },
+                { fieldName: 'connectionCount', gauge: Gauge.CONNECTION_COUNT_GAUGE, instrumentProperty: 'val', dataType: 'number', timeSeriesIndex: true, quantile: true, influxdbDataType: influxDBDataType.intField },
+                { fieldName: 'connectionPoolCount', gauge: Gauge.CONNECTION_POOL_TOTAL_GAUGE, instrumentProperty: 'val', dataType: 'number', influxdbDataType: influxDBDataType.intField },
+                { fieldName: 'connectionIdleCount', gauge: Gauge.CONNECTION_POOL_IDLE_GAUGE, instrumentProperty: 'val', dataType: 'number', influxdbDataType: influxDBDataType.intField },
+                { fieldName: 'connectionWaitingCount', gauge: Gauge.CONNECTION_POOL_WAITING_GAUGE, instrumentProperty: 'val', dataType: 'number', influxdbDataType: influxDBDataType.intField },
+                { fieldName: 'systemcpu', gauge: Gauge.CPU_SYSTEM_LOAD_GAUGE, instrumentProperty: 'val', dataType: 'number', timeSeriesIndex: true, quantile: true, influxdbDataType: influxDBDataType.floatField },
+                { fieldName: 'memory', gauge: Gauge.OBJECT_GAUGE, instrumentProperty: 'val', dataType: 'JSON', influxdbDataType: influxDBDataType.stringField }
+            ],
+            //@@ need type declare in appframework
+            GetPathFromContext(context: IContextBase): string {
+                //const { serviceId, serviceInstanceId, hostName, serviceInstanceProcessId, 
+                //pid, ppid, serviceName, serviceVersion } = instrumentPayload.context;
+                const { technology, subTechnology, lambdaInstance } = context;
+                return `/${technology}/${subTechnology}/${lambdaInstance}`;
+            },
+            redisQueryFilters: {
+                level1ContextField: 'serviceType',
+                level2ContextField: 'technology',
+                level3ContextField: 'subTechnology'
+            },
+            subscriptionTopics: [
+                {
+                    subscriptionTopic: SubscriptionTopic.AllLambdasCombined, // uicontrollerlanding
+                    route: '/metrics'
+                },
+                {
+                    subscriptionTopic: SubscriptionTopic.LambdaTechnologies, // uicontrollerlambda
+                    route: '/metrics/lambdas'
+                },
+                {
+                    subscriptionTopic: SubscriptionTopic.LambdaSubTechnologies, // uicontrollerlambdasubtechnologies
+                    route: '/metrics/lambdas/:key'
+                },
+                {
+                    subscriptionTopic: SubscriptionTopic.LambdaSubTechnologiesInstance, // uicontrollerlambdasubtechnologiesinstance
+                    route: '/metrics/lambdas/:key/:subkey'
+                }
+            ]
+        }
+    }
+}

package/src/index.ts

@@ -18,8 +18,10 @@ export * from './influxdb/influxDBManager'
 export * from './influxdb/influxDBManagerBase'
 export * from './influxdb/influxDBManagerService'
 export * from './influxdb/influxDBManagerAgent'
+export * from './influxdb/influxDBManagerLambda'
 export * from './publishertransports/publishTransportUtils'
 export * from './publishertransports/publishTransportDirect'
 export * from './instrumentationsubscriber'
 export * from './stsTransportWinston'
 export * from './stsTransportLoggerWinston'
+export * from './globalServiceDefinitions'

package/src/influxdb/influxDBManager.ts

@@ -13,6 +13,7 @@ const goptions = $Options()
 import { InfluxDBManagerBase } from './influxDBManagerBase'
 import { InfluxDBManagerService} from './influxDBManagerService'
 import { InfluxDBManagerAgent } from './influxDBManagerAgent'
+import { InfluxDBManagerLambda } from './influxDBManagerLambda'
 import { IInfluxDBManagerOptions } from './../commonTypes'
 import { IInstrumentPayload } from '@nsshunt/stspublisherserver'
 
@@ -318,6 +319,9 @@ export class InfluxDBManager
         case 'agent':
             this.#influxDBManagerClients[modelType] = new InfluxDBManagerAgent(this.#options, this.#queryApi);
             break;
+        case 'lambda':
+            this.#influxDBManagerClients[modelType] = new InfluxDBManagerLambda(this.#options, this.#queryApi);
+            break;
         default:
             throw new Error(`Model type: [${modelType} not supported.]`);
         }
@@ -331,6 +335,10 @@ export class InfluxDBManager
         return this.#influxDBManagerClients['agent'] as InfluxDBManagerAgent;
     }
 
+    get lambdaManager(): InfluxDBManagerLambda {
+        return this.#influxDBManagerClients['lambda'] as InfluxDBManagerLambda;
+    }
+
     Start = async () => {
         // perform any setup here
     }
@@ -510,16 +518,11 @@ export class InfluxDBManager
 
             //@@ Below is terrible - need a specific field on context for the service type
             if (instrumentPayload.context.agentName) {
-                return this.#influxDBManagerClients['agent'].OutputInfluxDB(this.writeClient, instrumentPayload);
+                return this.#influxDBManagerClients['agent'].OutputInfluxDB(this.writeClient, instrumentPayload, 'agent');
             } else if (instrumentPayload.context.lambdaFunctionName) {
-
-                //@@ todo
-                this.#LogInfoMessage(`TODO: Need to output InfluxDB data for: [${instrumentPayload.context.lambdaFunctionName}], Context: [${JSON.stringify(instrumentPayload.context)}]`);
-
-                return true;
-
+                return this.#influxDBManagerClients['lambda'].OutputInfluxDB(this.writeClient, instrumentPayload, 'lambda');
             } else {
-                return this.#influxDBManagerClients['service'].OutputInfluxDB(this.writeClient, instrumentPayload);
+                return this.#influxDBManagerClients['service'].OutputInfluxDB(this.writeClient, instrumentPayload, 'service');
             }
         } catch (error) {
             this.#LogErrorMessage(chalk.red(`${_logPrefix}OutputInfluxDB: Could not write data point: [${error}]`));
@@ -564,8 +567,6 @@ from(bucket: "my-db/")
 
 
 
-
-
 from(bucket: "TestBucket01") 
     |> range(start: -5s) 
     |> last()

package/src/influxdb/influxDBManagerAgent.ts

@@ -278,55 +278,4 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
             data: retVal 
         };
     }
-    
-    // Agent context payload
-    // {"nid":"somehost@e58f5d75-6ff6-4e04-92a4-f2bcd722fec0-someuseragent|MainProcess|0","id":"somehost@e58f5d75-6ff6-4e04-92a4-f2bcd722fec0-someuseragent|MainProcess|0","hostName":"somehost"
-    // ,"agentName":"e58f5d75-6ff6-4e04-92a4-f2bcd722fec0-someuseragent","threadId":"MainProcess","asyncRunnerId":"0"}
-    async OutputInfluxDB(writeApi: WriteApi, instrumentPayload: IInstrumentPayload): Promise<boolean> {
-        if (writeApi) {
-            try {
-                const { nid, id, hostName, agentName, threadId, asyncRunnerId } = instrumentPayload.context;
-
-                let systemcpu = 0.0;
-                if (instrumentPayload.instruments[Gauge.CPU_SYSTEM_LOAD_GAUGE]) {
-                    systemcpu = (instrumentPayload.instruments[Gauge.CPU_SYSTEM_LOAD_GAUGE].val as number);
-                }
-
-                const point = new Point('all')
-                    .measurement('agent')
-                    // Context settings
-                    .tag('id', id as string) // Must be unique (uuid)
-                    .tag('hostName', hostName as string) // Must be unique (uuid)
-                    .tag('agentName', agentName as string) // Must be unique (uuid)
-                    .tag('threadId', threadId as string) // Must be unique (uuid)
-                    .tag('asyncRunnerId', asyncRunnerId as string)
-                    // Data fields
-                    .intField('requestCount', instrumentPayload.instruments[Gauge.REQUEST_COUNT_GAUGE].val) // q
-                    .intField('errorCount', instrumentPayload.instruments[Gauge.ERROR_COUNT_GAUGE].val) // j
-                    .intField('retryCount', instrumentPayload.instruments[Gauge.RETRY_COUNT_GAUGE].val) // r
-                    .intField('authenticationCount', instrumentPayload.instruments[Gauge.AUTHENTICATION_COUNT_GAUGE].val) // b
-                    .intField('authenticationErrorCount', instrumentPayload.instruments[Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE].val) // aa
-                    .intField('authenticationRetryCount', instrumentPayload.instruments[Gauge.AUTHENTICATION_RETRY_COUNT_GAUGE].val) // ab
-                    .floatField('velocity', (instrumentPayload.instruments[Gauge.VELOCITY_GAUGE] as InstrumentVelocity).va) // t - Note: Using va not val here
-                    .intField('coreCount', instrumentPayload.instruments[Gauge.CORE_COUNT_GAUGE].val) // x
-                    .floatField('rx', (instrumentPayload.instruments[Gauge.NETWORK_RX_GAUGE] as InstrumentVelocity).va) // Note: Using va not val here
-                    .floatField('tx', (instrumentPayload.instruments[Gauge.NETWORK_TX_GAUGE] as InstrumentVelocity).va) // Note: Using va not val here
-                    .floatField('timer', instrumentPayload.instruments[Gauge.TIMER_GAUGE].val) // s
-                    .floatField('duration', instrumentPayload.instruments[Gauge.DURATION_GAUGE].val) // h
-                    .floatField('latency', instrumentPayload.instruments[Gauge.LATENCY_GAUGE].val) // h
-                    .intField('activeRequestCount', instrumentPayload.instruments[Gauge.ACTIVE_REQUEST_GAUGE].val) // a
-                    .intField('childCount', instrumentPayload.instruments[Gauge.CHILD_COUNT].val) // y
-                    // logger // m
-                    // duration histo // i
-                writeApi.writePoint(point);
-                return true;
-            } catch (error: any) {
-                this.#LogErrorMessage(chalk.red(`${_logPrefix}OutputInfluxDBAgent: Could not write data point: [${error}]`));
-                return false;
-            }
-        } else {
-            this.#LogErrorMessage(chalk.red(`${_logPrefix}OutputInfluxDBAgent: Could not write data point as writeClient is null`));
-            return false;
-        }
-    }
 }