Make perf optional (#435)

* create new subscription to get device load from currently only mockup of perfMon server * add new subscription to get load of multiple devices at once * handle null or empty values for model and version * shorten null value handler * implement connection to the perf monitoring service * add stream mutation changes (#434) * add new env variable to make perf monit optional * add missing env variables to pr check --------- Co-authored-by: Martin Sottnik <[email protected]> Co-authored-by: plehocky <[email protected]>
FRINXio · May 27, 2024 · 3078758 · 3078758
1 parent 6ffc65c
commit 3078758
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 3 deletions.
diff --git a/.env.example b/.env.example
@@ -17,4 +17,6 @@ PERFORMANCE_MONITORING_GRAPHQL_API_URL=http://localhost:8082/api/graphql
 
 KAFKA_BROKER="10.19.0.25:9094"
 KAFKA_TOPIC=frinx
-KAFKA_ENABLED=false
+KAFKA_ENABLED=false
+
+PERFORMANCE_MONITORING_ENABLED=true
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -48,6 +48,7 @@ jobs:
           KAFKA_BROKER: 10.19.0.25:30006
           KAFKA_TOPIC: uniconfig
           KAFKA_ENABLED: false
+          PERFORMANCE_MONITORING_ENABLED: true
       - name: Check code formatting
         run: npm run formatter:check
       - name: Run eslint check

diff --git a/src/config.ts b/src/config.ts
@@ -42,6 +42,17 @@ type TopologyConfigDisabled = {
 
 type TopologyConfig = TopologyConfigDisabled | TopologyConfigEnabled;
 
+type PerformanceMonitoringConfigEnabled = {
+  performanceMonitoringEnabled: true;
+  performanceMonitoringGraphqlURL: string;
+};
+
+type PerfomanceMonitoringConfigDisabled = {
+  performanceMonitoringEnabled: false;
+};
+
+type PerformanceMonitoringConfig = PerfomanceMonitoringConfigDisabled | PerformanceMonitoringConfigEnabled;
+
 // all arango params must be present or none
 function getTopologyConfig(): TopologyConfig {
   const topologyEnabled = stringToBoolean(envString('TOPOLOGY_ENABLED'));
@@ -69,6 +80,27 @@ function getTopologyConfig(): TopologyConfig {
   };
 }
 
+function getPerformanceMonitoringConfig(): PerformanceMonitoringConfig {
+  const performanceMonitoringEnabled = stringToBoolean(envString('PERFORMANCE_MONITORING_ENABLED'));
+  const topologyEnabled = stringToBoolean(envString('TOPOLOGY_ENABLED'));
+  const performanceMonitoringGraphqlURL = optionalEnvString('PERFORMANCE_MONITORING_GRAPHQL_API_URL');
+
+  if (!performanceMonitoringEnabled || !topologyEnabled) {
+    return {
+      performanceMonitoringEnabled: false,
+    };
+  }
+
+  if (!performanceMonitoringGraphqlURL) {
+    throw new Error('Not all mandatory topology discovery url (PERFORMANCE_MONITORING_GRAPHQL_API_URL) were found.');
+  }
+
+  return {
+    performanceMonitoringEnabled: true,
+    performanceMonitoringGraphqlURL,
+  };
+}
+
 const config = {
   host: envString('HOST'),
   port: envString('PORT'),
@@ -82,6 +114,7 @@ const config = {
   kafkaTopic: envString('KAFKA_TOPIC'),
   kafkaEnabled: stringToBoolean(envString('KAFKA_ENABLED')),
   ...getTopologyConfig(),
+  ...getPerformanceMonitoringConfig(),
 };
 
 export default config;
diff --git a/src/external-api/performance-monitoring-graphql.ts b/src/external-api/performance-monitoring-graphql.ts
@@ -53,6 +53,7 @@ const DEVICE_CPU_USAGE = gql`
 `;
 
 function getPerformanceMonitoringAPI() {
+  if (config.performanceMonitoringEnabled === false) {
   if (config.topologyEnabled === false) {
     return undefined;
   }

diff --git a/src/schema/api.graphql b/src/schema/api.graphql
@@ -57,6 +57,7 @@ type AddSnapshotPayload {
 input AddStreamInput {
   deviceName: String!
   streamName: String!
+  streamParameters: String
 }
 
 type AddStreamPayload {

diff --git a/src/schema/nexus-typegen.ts b/src/schema/nexus-typegen.ts
@@ -68,6 +68,7 @@ export interface NexusGenInputs {
     // input type
     deviceName: string; // String!
     streamName: string; // String!
+    streamParameters?: string | null; // String
   };
   AddZoneInput: {
     // input type

diff --git a/src/schema/stream.ts b/src/schema/stream.ts
@@ -115,6 +115,7 @@ export const AddStreamInput = inputObjectType({
   definition: (t) => {
     t.nonNull.string('streamName');
     t.nonNull.string('deviceName');
+    t.string('streamParameters');
   },
 });
 
@@ -139,6 +140,7 @@ export const AddStreamMutation = extendType({
           data: {
             deviceName: input.deviceName,
             streamName: input.streamName,
+            streamParameters: input.streamParameters != null ? JSON.parse(input.streamParameters) : undefined,
             tenantId,
           },
         });
@@ -180,13 +182,13 @@ export const ActivateStreamMutation = extendType({
         const { streamName, deviceName, streamParameters, device } = stream;
         const uniconfigStreamName = getUniconfigStreamName(streamName, deviceName);
         // TODO: create column stream params
-        const installDeviceParams = prepareInstallParameters(
+        const installStreamParams = prepareInstallParameters(
           uniconfigStreamName,
           getMountParamsForStream(device.mountParameters, streamParameters),
         );
 
         const uniconfigURL = await getUniconfigURL(prisma, device.uniconfigZoneId);
-        await installDeviceCache({ uniconfigURL, deviceName: uniconfigStreamName, params: installDeviceParams });
+        await installDeviceCache({ uniconfigURL, deviceName: uniconfigStreamName, params: installStreamParams });
 
         return { stream };
       },