@nsshunt/stsdatamanagement 1.17.99 → 1.17.100

package/db-scripts/builddb.sql

@@ -28,7 +28,356 @@ ALTER SEQUENCE public.stsresource_oid_seq
     OWNER TO postgres;
 
 
--- Table: public.stsresource
+CREATE SEQUENCE public.stsmonitor_oid_seq
+  AS BIGINT
+    INCREMENT 1
+    START 1
+    MINVALUE 1
+    CACHE 1;
+
+ALTER SEQUENCE public.stsmonitor_oid_seq
+    OWNER TO postgres;
+
+
+-----[ stsmonitor ]--------------------------------
+
+CREATE TABLE public.stsmonitor
+(
+    oid bigint NOT NULL DEFAULT nextval('stsmonitor_oid_seq'::regclass),
+
+	-- main graph key
+	context character varying(512) COLLATE pg_catalog."default" NOT NULL,
+
+	-- Tree level attributes (context)
+	servicetype character varying(128) COLLATE pg_catalog."default" NOT NULL,
+	serviceid character varying(128) COLLATE pg_catalog."default" NOT NULL,
+	serviceinstanceid character varying(128) COLLATE pg_catalog."default" NOT NULL,
+	serviceidhostname character varying(128) COLLATE pg_catalog."default" NOT NULL,
+
+	serviceinstanceprocessid character varying(128) COLLATE pg_catalog."default" NOT NULL,
+	pid integer NOT NULL,
+	ppid integer NOT NULL,
+	ismaster boolean NOT NULL,
+	isworker boolean NOT NULL,
+	servicename character varying(128) COLLATE pg_catalog."default" NOT NULL,
+	serviceversion character varying(128) COLLATE pg_catalog."default" NOT NULL,
+
+	-- Leaf level attributes
+	-- Count based (summed in summary views)
+	request_count_gauge integer NULL,
+	error_count_gauge integer NULL,
+	retry_count_gauge integer NULL,
+	authentication_count_gauge integer NULL,
+	velocity_gauge integer NULL,
+	cpu_load_gauge integer NULL,
+	active_request_gauge integer NULL,
+	connection_count_gauge integer NULL,
+	connection_pool_total_gauge integer NULL,
+	connection_pool_idle_gauge integer NULL,
+	connection_pool_waiting_gauge integer NULL,
+	core_count_gauge integer NULL,
+
+    -- Define the gauges that provide a point in time value that conveys meaning at that point in time.
+    -- These values will not be aggregated (summed) in summary views.
+	timer_gauge integer NULL,
+
+	-- average gauges
+	duration_gauge integer NULL,
+    latency_gauge integer NULL,
+
+    -- Define the histogram gauges
+	duration_histogram_gauge integer ARRAY NULL,
+	latency_histogram_gauge integer ARRAY NULL,
+
+    -- Define logger based gauges
+	logger  character varying(32768) COLLATE pg_catalog."default",
+
+	-- Standard STS attributes
+    validfrom timestamp with time zone NOT NULL,
+    validto timestamp with time zone,
+    vnum bigint NOT NULL,
+    dbaction smallint NOT NULL,
+    dbactionuser character varying(64) COLLATE pg_catalog."default" NOT NULL,
+    CONSTRAINT stsmonitor_pkey PRIMARY KEY (oid)
+)
+
+TABLESPACE pg_default;
+
+ALTER TABLE public.stsmonitor
+    OWNER to postgres;
+-- Index: stsresource_resname_vnum;
+
+-- DROP INDEX public.stsresource_resname_vnum;
+
+CREATE UNIQUE INDEX stsmonitor_prim_index
+    ON public.stsmonitor USING btree
+    (context COLLATE pg_catalog."default" ASC NULLS LAST, 
+		servicetype COLLATE pg_catalog."default" ASC NULLS LAST, 
+		serviceid COLLATE pg_catalog."default" ASC NULLS LAST,
+		serviceinstanceid COLLATE pg_catalog."default" ASC NULLS LAST,
+		serviceidhostname COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+
+CREATE OR REPLACE FUNCTION public.create_stsmonitor(
+	_dbactionuser character varying,
+
+	_context character varying,
+
+	_servicetype character varying,
+	_serviceid character varying,
+	_serviceinstanceid character varying,
+	_serviceidhostname character varying,
+
+	_serviceinstanceprocessid character varying,
+	_pid integer,
+	_ppid integer,
+	_ismaster boolean,
+	_isworker boolean,
+	_servicename character varying,
+	_serviceversion character varying,
+
+	-- Leaf level attributes
+	-- Count based (summed in summary views)
+	_request_count_gauge integer,
+	_error_count_gauge integer,
+	_retry_count_gauge integer,
+	_authentication_count_gauge integer,
+	_velocity_gauge integer,
+	_cpu_load_gauge integer,
+	_active_request_gauge integer,
+	_connection_count_gauge integer,
+	_connection_pool_total_gauge integer,
+	_connection_pool_idle_gauge integer,
+	_connection_pool_waiting_gauge integer,
+	_core_count_gauge integer,
+
+    -- Define the gauges that provide a point in time value that conveys meaning at that point in time.
+    -- These values will not be aggregated (summed) in summary views.
+	_timer_gauge integer,
+
+	-- average gauges
+	_duration_gauge integer,
+    _latency_gauge integer,
+
+    -- Define the histogram gauges
+	_duration_histogram_gauge integer ARRAY,
+	_latency_histogram_gauge integer ARRAY
+	)
+    RETURNS SETOF stsmonitor
+    LANGUAGE 'plpgsql'
+
+    COST 100
+    VOLATILE 
+    ROWS 1000
+    
+AS $BODY$
+DECLARE
+	__now timestamp without time zone := now();
+	__resoid bigint;
+	__vnum bigint;
+	__dbaction smallint;
+	__inserted_oid bigint;
+BEGIN
+	begin
+		select oid, vnum, dbaction into __resoid, __vnum, __dbaction from stsmonitor m where m.context = _context and m.validto is null;
+		-- Too many records exists using the supplied data, the database is in an invalid state for this resource
+		exception
+			when sqlstate '21000' then 
+	    	  raise exception 'Too many stsmonitor records for current version using stsmonitor %', _context USING ERRCODE = 'cardinality_violation';
+	end;
+  
+	if __resoid is not null then
+		-- We have an existing resource
+		if __dbaction = 3 then
+			-- The existing resource is deleted, update the current version
+			update stsmonitor
+
+			set context = _context,
+				servicetype = _servicetype,
+				serviceid = _serviceid,
+				serviceinstanceid = _serviceinstanceid,
+				serviceidhostname = _serviceidhostname,
+
+				serviceinstanceprocessid = _serviceinstanceprocessid,
+				pid = _pid,
+				ppid = _ppid,
+				ismaster = _ismaster,
+				isworker = _isworker,
+				servicename = _servicename,
+				serviceversion = _serviceversion,
+
+				request_count_gauge = _request_count_gauge,
+				error_count_gauge = _error_count_gauge,
+				retry_count_gauge = _retry_count_gauge,
+				authentication_count_gauge = _authentication_count_gauge,
+				velocity_gauge = _velocity_gauge,
+				cpu_load_gauge = _cpu_load_gauge,
+				active_request_gauge = _active_request_gauge,
+				connection_count_gauge = _connection_count_gauge,
+				connection_pool_total_gauge = _connection_pool_total_gauge,
+				connection_pool_idle_gauge = _connection_pool_idle_gauge,
+				connection_pool_waiting_gauge = _connection_pool_waiting_gauge,
+				core_count_gauge = _core_count_gauge,
+
+				timer_gauge = _timer_gauge,
+
+				duration_gauge = _duration_gauge,
+				latency_gauge = _latency_gauge,
+
+				duration_histogram_gauge = _duration_histogram_gauge,
+				latency_histogram_gauge = _latency_histogram_gauge,
+
+				validfrom = __now ,
+				dbactionuser = _dbactionuser
+
+			where oid = __resoid;
+
+			return query
+			select * from stsresource where oid = __resoid;
+		else
+			-- The current version is in an active state, raise unique violate condition
+	        RAISE 'Duplicate context within stsmonitor: %', _resname USING ERRCODE = 'unique_violation';
+		end if;
+	else
+		/*
+		For some unknown reason, the below works in pg outside and inside a docker container
+		but does NOT work inside a docker swarm or a K3 cluster.
+		-- No current version exists, create a new record
+		return query
+		insert into stsresource(resname, resdesc, vnum, dbaction, dbactionuser, validfrom)
+		values (_resname, _resdesc, 1, 1, _dbactionuser, __now) 
+		returning *;
+		*/
+
+		insert into stsmonitor(
+			context,
+			servicetype,
+			serviceid,
+			serviceinstanceid,
+			serviceidhostname,
+
+			serviceinstanceprocessid,
+			pid,
+			ppid,
+			ismaster,
+			isworker,
+			servicename,
+			serviceversion,
+
+			request_count_gauge,
+			error_count_gauge,
+			retry_count_gauge,
+			authentication_count_gauge,
+			velocity_gauge,
+			cpu_load_gauge,
+			active_request_gauge,
+			connection_count_gauge,
+			connection_pool_total_gauge,
+			connection_pool_idle_gauge,
+			connection_pool_waiting_gauge,
+			core_count_gauge,
+
+			timer_gauge,
+
+			duration_gauge,
+			latency_gauge,
+
+			duration_histogram_gauge,
+			latency_histogram_gauge,
+
+			vnum, dbaction, dbactionuser, validfrom)
+		values (
+			_context,
+			_servicetype,
+			_serviceid,
+			_serviceinstanceid,
+			_serviceidhostname,
+
+			_serviceinstanceprocessid,
+			_pid,
+			_ppid,
+			_ismaster,
+			_isworker,
+			_servicename,
+			_serviceversion,
+
+			_request_count_gauge,
+			_error_count_gauge,
+			_retry_count_gauge,
+			_authentication_count_gauge,
+			_velocity_gauge,
+			_cpu_load_gauge,
+			_active_request_gauge,
+			_connection_count_gauge,
+			_connection_pool_total_gauge,
+			_connection_pool_idle_gauge,
+			_connection_pool_waiting_gauge,
+			_core_count_gauge,
+
+			_timer_gauge,
+
+			_duration_gauge,
+			_latency_gauge,
+
+			_duration_histogram_gauge,
+			_latency_histogram_gauge,
+		
+			1, 1, _dbactionuser, __now)
+		returning oid into __inserted_oid;
+
+		return query
+		select * from stsmonitor where oid = __inserted_oid;
+	end if;
+END;
+$BODY$;
+
+ALTER FUNCTION public.create_stsmonitor(
+	character varying,
+
+	character varying,
+
+	character varying,
+	character varying,
+	character varying,
+	character varying,
+
+	character varying,
+	integer,
+	integer,
+	boolean,
+	boolean,
+	character varying,
+	character varying,
+
+	integer,
+	integer,
+	integer,
+	integer,
+	integer,
+	integer,
+	integer,
+	integer,
+	integer,
+	integer,
+	integer,
+	integer,
+
+	integer,
+
+	integer,
+    integer,
+
+	integer ARRAY,
+	integer ARRAY
+	)
+    OWNER TO postgres;
+
+
+
+
+
+-- [ Table: public.stsresource ] ------------------------------------------------------------------------
 
 -- DROP TABLE public.stsresource;
 
@@ -204,7 +553,7 @@ BEGIN
 	else
 		/*
 		For some unknown reason, the below works in pg outside and inside a docker container
-		but does NOT work inside a docker swarm of a K3 cluster.
+		but does NOT work inside a docker swarm or a K3 cluster.
 		-- No current version exists, create a new record
 		return query
 		insert into stsresource(resname, resdesc, vnum, dbaction, dbactionuser, validfrom)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nsshunt/stsdatamanagement",
-    "version": "1.17.99",
+    "version": "1.17.100",
     "description": "STS Data Management Modules, Utilities and Services",
     "main": "./dist/dbaccess.js",
     "types": "./types/dbaccess.d.ts",
@@ -32,20 +32,20 @@
         "@tsconfig/node20": "^1.0.2",
         "@types/cli-progress": "^3.11.0",
         "@types/debug": "^4.1.8",
-        "@types/node": "^20.3.2",
+        "@types/node": "^20.3.3",
         "@types/pg": "^8.10.2",
         "@types/pg-copy-streams": "^1.2.2",
         "@types/prompts": "^2.4.4",
         "@types/uuid": "^9.0.2",
-        "@typescript-eslint/eslint-plugin": "^5.60.1",
-        "@typescript-eslint/parser": "^5.60.1",
-        "eslint": "^8.43.0",
+        "@typescript-eslint/eslint-plugin": "^5.61.0",
+        "@typescript-eslint/parser": "^5.61.0",
+        "eslint": "^8.44.0",
         "rollup-plugin-polyfill-node": "^0.12.0",
         "rollup-plugin-visualizer": "^5.9.2",
         "testcontainers": "^9.9.1",
         "typescript": "^5.1.6",
         "vite": "^4.3.2",
-        "vitest": "^0.32.2"
+        "vitest": "^0.32.4"
     },
     "scripts": {
         "lint": "eslint . --ext js,jsx,ts,tsx",