Merge pull request #1104 from mountaindude/1097

1097
ptarmiganlabs · Apr 23, 2024 · 339507f · 339507f
2 parents 092ebef + a813ad5
commit 339507f
Show file tree

Hide file tree

Showing 6 changed files with 691 additions and 166 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
         "@breejs/later": "^4.2.0",
         "@fastify/autoload": "^5.8.0",
         "@fastify/rate-limit": "^9.1.0",
-        "@fastify/reply-from": "^9.7.0",
+        "@fastify/reply-from": "^9.8.0",
         "@fastify/sensible": "^5.5.0",
         "@fastify/swagger": "^8.14.0",
         "@fastify/swagger-ui": "^3.0.0",
@@ -87,7 +87,7 @@
         "mkdirp": "^3.0.1",
         "moment": "^2.30.1",
         "moment-precise-range-plugin": "^1.3.0",
-        "mqtt": "^5.5.2",
+        "mqtt": "^5.5.3",
         "ms-teams-wrapper": "^1.0.2",
         "nodemailer": "^6.9.13",
         "nodemailer-express-handlebars": "^6.1.2",
@@ -103,15 +103,15 @@
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0",
         "ws": "^8.16.0",
-        "xstate": "^5.10.0"
+        "xstate": "^5.11.0"
     },
     "devDependencies": {
         "@babel/eslint-parser": "^7.24.1",
         "@babel/plugin-syntax-import-assertions": "^7.24.1",
         "eslint-plugin-import": "^2.29.1",
         "jest": "^29.7.0",
         "prettier": "^3.2.5",
-        "snyk": "^1.1288.0"
+        "snyk": "^1.1290.0"
     },
     "pkg": {
         "assets": [

diff --git a/src/config/config-gen-api-docs.yaml b/src/config/config-gen-api-docs.yaml
@@ -132,31 +132,49 @@ Butler:
   # Settings for monitoring Qlik Sense licenses
   qlikSenseLicense:
     licenseMonitor:
-      enable: true
-      frequency: every 5 minutes
+      enable: false
+      frequency: every 6 hours        # https://bunkat.github.io/later/parsers.html#text
       destination:
-        influxDb:                     # Send service alerts to InfluxDB
+        influxDb:                     # Store license data in InfluxDB
           enable: true
           tag: 
-            static:                     # Static attributes/dimensions to attach to the data sent to New Relic.
+            static:                   # Static attributes/tags to attach to the data sent to InflixDB
               # - name: foo
               #   value: bar
     licenseRelease:
-      enable: false  
-      # frequency: every 3 hours
-      frequency: every 5 minutes
-      neverReleaseUsers:
-        # - userDir: 'INTERNAL'
-        #   userId: 'sa_repository'
-        # - userDir: 'INTERNAL'
-        #   userId: 'sa_api'
+      enable: false                    # true/false. If true, Butler will release unused licenses according to settings below
+      dryRun: true                    # true/false. If true, Butler will not actually release any licenses, just log what it would have done. 
+      frequency: every 6 hours        # https://bunkat.github.io/later/parsers.html#text
+      neverRelease:                   # Various ways of defining which users should never have their licenses released
+        user:                         # Users who should never have their licenses released
+          # - userDir: 'INTERNAL'
+          #   userId: 'sa_repository'
+          # - userDir: 'INTERNAL'
+          #   userId: 'sa_api'
+          # - userDir: 'USERDIR'
+          #   userId: 'qs_admin_account'
+        tag:                          # Users with these tags will never have their licenses released
+          # - License do not release
+          # - some other tag
+        customProperty:               # Users with these custom properties will never have their licenses released
+          # - name: LicenseManage
+          #   value: do-not-release
+        userDirectory:                # List of user directories whose users should never have their licenses released
+          # - INTERNAL
+          # - ADMIN
+        inactive: Ignore              # Ignore/Yes/No. The value is case insensitive
+                                      #   No = Don't release licenses for users marked as "Inactive=No" in the QMC
+                                      #   Yes = Don't release licenses for users marked as "Inactive=Yes" in the QMC 
+                                      #   Ignore = Disregard this setting
+        blocked: Ignore               # Ignore/Yes/No, No = Don't release licenses for users marked as "Blocked=No" in the QMC
+        removedExternally: ignore     # Ignore/Yes/No, No = Don't release licenses for users marked as "Removed externally=No" in the QMC
       licenseType:                    # License types to monitor and release
         analyzer:                     
-          enable: true
-          releaseThresholdDays: 5
+          enable: true                # Monitor and release Analyzer licenses
+          releaseThresholdDays: 30    # Number of days a license can be unused before it is released
         professional:
-          enable: true
-          releaseThresholdDays: 5
+          enable: true                # Monitor and release Professional licenses
+          releaseThresholdDays: 30    # Number of days a license can be unused before it is released
       destination:
         influxDb:                     # Store info about released licenses in InfluxDB
           enable: true

diff --git a/src/config/production_template.yaml b/src/config/production_template.yaml
@@ -139,7 +139,7 @@ Butler:
   # Settings for monitoring Qlik Sense licenses
   qlikSenseLicense:
     licenseMonitor:
-      enable: true
+      enable: false
       frequency: every 6 hours        # https://bunkat.github.io/later/parsers.html#text
       destination:
         influxDb:                     # Store license data in InfluxDB
@@ -149,15 +149,32 @@ Butler:
               - name: foo
                 value: bar
     licenseRelease:
-      enable: true
+      enable: false                    # true/false. If true, Butler will release unused licenses according to settings below
+      dryRun: true                    # true/false. If true, Butler will not actually release any licenses, just log what it would have done. 
       frequency: every 6 hours        # https://bunkat.github.io/later/parsers.html#text
-      neverReleaseUsers:              # Users that should never have their license released
-        - userDir: 'INTERNAL'
-          userId: 'sa_repository'
-        - userDir: 'INTERNAL'
-          userId: 'sa_api'
-        - userDir: 'USERDIR'
-          userId: 'qs_admin_account'
+      neverRelease:                   # Various ways of defining which users should never have their licenses released
+        user:                         # Users who should never have their licenses released
+          - userDir: 'INTERNAL'
+            userId: 'sa_repository'
+          - userDir: 'INTERNAL'
+            userId: 'sa_api'
+          - userDir: 'USERDIR'
+            userId: 'qs_admin_account'
+        tag:                          # Users with these tags will never have their licenses released
+          - License do not release
+          - some other tag
+        customProperty:               # Users with these custom properties will never have their licenses released
+          - name: LicenseManage
+            value: do-not-release
+        userDirectory:                # List of user directories whose users should never have their licenses released
+          - INTERNAL
+          - ADMIN
+        inactive: Ignore              # Ignore/Yes/No. The value is case insensitive
+                                      #   No = Don't release licenses for users marked as "Inactive=No" in the QMC
+                                      #   Yes = Don't release licenses for users marked as "Inactive=Yes" in the QMC 
+                                      #   Ignore = Disregard this setting
+        blocked: Ignore               # Ignore/Yes/No, No = Don't release licenses for users marked as "Blocked=No" in the QMC
+        removedExternally: ignore     # Ignore/Yes/No, No = Don't release licenses for users marked as "Removed externally=No" in the QMC
       licenseType:                    # License types to monitor and release
         analyzer:                     
           enable: true                # Monitor and release Analyzer licenses