Update-2021-12-24_08:51:50

netrisai · Dec 24, 2021 · 3fea03a · 3fea03a
1 parent dc4d6aa
commit 3fea03a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 26 deletions.
diff --git a/charts/netris-controller/Chart.yaml b/charts/netris-controller/Chart.yaml
@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.2
+version: 1.0.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: 3.0.2
+appVersion: 3.0.2.1
 home: https://netris.ai
 icon: https://www.netris.ai/wp-content/uploads/2021/01/logo-300.png  # [todo] Change url to permalink
 keywords:

diff --git a/charts/netris-controller/README.md b/charts/netris-controller/README.md
@@ -78,7 +78,7 @@ The following table lists the configurable parameters of the netris-controller c
 | ------------------------------------- | --------------------------------------------------------------------------------------------------------- | -------------------------- |
 | `app.replicaCount`                    | Number of replicas in app deployment                                                                      | `1`                        |
 | `app.image.repository`                | Image repository                                                                                          | `netrisai/controller-web-service` |
-| `app.image.tag`                       | Image tag. Overrides the image tag whose default is the chart appVersion                                  | `"3.0.2-011"`                       |
+| `app.image.tag`                       | Image tag. Overrides the image tag whose default is the chart appVersion                                  | `"3.0.2-013"`                       |
 | `app.image.pullPolicy`                | Image pull policy                                                                                         | `IfNotPresent`             |
 | `app.imagePullSecrets`                | Reference to one or more secrets to be used when pulling images                                           | `[]`                       |
 | `app.service.type`                    | Kubernetes service type 	                                                                                | `ClusterIP`                |
@@ -102,7 +102,7 @@ The following table lists the configurable parameters of the netris-controller c
 | -------------------------------------- | --------------------------------------------------------------------------------------------------------- | -------------------------- |
 | `grpc.replicaCount`                    | Number of replicas in grpc deployment                                                                     | `1`                        |
 | `grpc.image.repository`                | Image repository                                                                                          | `netrisai/controller-grpc` |
-| `grpc.image.tag`                       | Image tag. Overrides the image tag whose default is the chart appVersion                                  | `"3.0.2.001"`                       |
+| `grpc.image.tag`                       | Image tag. Overrides the image tag whose default is the chart appVersion                                  | `"3.0.2.002"`                       |
 | `grpc.image.pullPolicy`                | Image pull policy                                                                                         | `IfNotPresent`             |
 | `grpc.imagePullSecrets`                | Reference to one or more secrets to be used when pulling images                                           | `[]`                       |
 | `grpc.service.type`                    | Kubernetes service type 	                                                                                 | `ClusterIP`                |
@@ -119,7 +119,7 @@ The following table lists the configurable parameters of the netris-controller c
 | ------------------------------------- | --------------------------------------------------------------------------------------------------------- | -------------------------- |
 | `telescope.replicaCount`                    | Number of replicas in telescope deployment                                                          | `1`                        |
 | `telescope.image.repository`                | Image repository                                                                                          | `netrisai/controller-telescope` |
-| `telescope.image.tag`                       | Image tag. Overrides the image tag whose default is the chart appVersion                                  | `""`                       |
+| `telescope.image.tag`                       | Image tag. Overrides the image tag whose default is the chart appVersion                                  | `"3.0.2"`                       |
 | `telescope.image.pullPolicy`                | Image pull policy                                                                                         | `IfNotPresent`             |
 | `telescope.imagePullSecrets`                | Reference to one or more secrets to be used when pulling images                                           | `[]`                       |
 | `telescope.service.type`                    | Kubernetes service type 	                                                                                | `ClusterIP`                |

diff --git a/charts/netris-controller/templates/netris-controller-initdb.yaml b/charts/netris-controller/templates/netris-controller-initdb.yaml
@@ -1527,24 +1527,23 @@ data:
     INSERT INTO `global_settings` VALUES (38,'vpn_measurement_wait_secs','30','Site Mesh measurement module wait interval (sec)','true');
     INSERT INTO `global_settings` VALUES (39,'migration_version', '3.0.0', 'Database scheme version', 'false');
     INSERT INTO `global_settings` VALUES (40,'system_asn_range', '4200000000 - 4294967294', 'System ASN range', true);
-  mon_thresholds.sql: |+
+  mon_thresholds.sql: |
     USE {{ .Values.mariadb.auth.database }};
-    INSERT INTO `mon_default_thresholds` VALUES (2,'check_port',NULL,'*.rx',0,0,90,70,NULL,'%','');
-    INSERT INTO `mon_default_thresholds` VALUES (3,'check_port',NULL,'*.tx',0,0,90,70,NULL,'%','');
-    INSERT INTO `mon_default_thresholds` VALUES (4,'check_port',NULL,'*.signal',-18,-15,10,4,NULL,'dbm','');
+    INSERT INTO `mon_default_thresholds` VALUES (2,'check_port','Link Utilization (RX)','*.rx',0,0,90,70,NULL,'%','');
+    INSERT INTO `mon_default_thresholds` VALUES (3,'check_port','Link Utilization (TX)','*.tx',0,0,90,70,NULL,'%','');
+    INSERT INTO `mon_default_thresholds` VALUES (4,'check_port','General signal level','*.signal',-18,-15,10,4,NULL,'dbm','');
     INSERT INTO `mon_default_thresholds` VALUES (5,'check_port',NULL,'*.link',NULL,NULL,NULL,NULL,0,'','');
-    INSERT INTO `mon_default_thresholds` VALUES (6,'check_load',NULL,'load',0,0,4,3,NULL,'','');
-    INSERT INTO `mon_default_thresholds` VALUES (7,'check_load',NULL,'sg_load',0,0,20,18,NULL,'','');
-    INSERT INTO `mon_default_thresholds` VALUES (8,'check_load',NULL,'pve_load',0,0,10,9,NULL,'','');
-    INSERT INTO `mon_default_thresholds` VALUES (9,'check_memory',NULL,'memory',0,0,80,90,NULL,'%','');
+    INSERT INTO `mon_default_thresholds` VALUES (6,'check_load','Load average (switch)','load',0,0,4,3,NULL,'','');
+    INSERT INTO `mon_default_thresholds` VALUES (7,'check_load','Load average (softgate)','sg_load',0,0,20,18,NULL,'','');
+    INSERT INTO `mon_default_thresholds` VALUES (8,'check_load','Load average (hypervisor)','pve_load',0,0,10,9,NULL,'','');
+    INSERT INTO `mon_default_thresholds` VALUES (9,'check_memory','Free memory usage','memory',0,0,80,90,NULL,'%','');
     INSERT INTO `mon_default_thresholds` VALUES (10,'check_agent',NULL,'agent',NULL,NULL,NULL,NULL,0,'','');
-    INSERT INTO `mon_default_thresholds` VALUES (11,'check_disk',NULL,'*.disk',0,0,80,70,NULL,'%','');
-    INSERT INTO `mon_default_thresholds` VALUES (12,'check_port','signal level for 1G','*.signal.1',-23,-22,1,0,NULL,'dbm','');
-    INSERT INTO `mon_default_thresholds` VALUES (13,'check_port','signal level for 10g','*.signal.10',-19,-18,10,0,NULL,'dbm','');
-    INSERT INTO `mon_default_thresholds` VALUES (14,'check_port','signal level for 40G','*.signal.40',-13,-12,4,3,NULL,'dbm','');
-    INSERT INTO `mon_default_thresholds` VALUES (15,'check_port','signal level for 100G','*.signal.100',-12,-11,5,4,NULL,'dbm','');
+    INSERT INTO `mon_default_thresholds` VALUES (11,'check_disk','Disk utilization','*.disk',0,0,80,70,NULL,'%','');
+    INSERT INTO `mon_default_thresholds` VALUES (12,'check_port','Signal level for 1G','*.signal.1',-23,-22,1,0,NULL,'dbm','');
+    INSERT INTO `mon_default_thresholds` VALUES (13,'check_port','Signal level for 10g','*.signal.10',-19,-18,10,0,NULL,'dbm','');
+    INSERT INTO `mon_default_thresholds` VALUES (14,'check_port','Signal level for 40G','*.signal.40',-13,-12,4,3,NULL,'dbm','');
+    INSERT INTO `mon_default_thresholds` VALUES (15,'check_port','Signal level for 100G','*.signal.100',-12,-11,5,4,NULL,'dbm','');
     INSERT INTO `mon_default_thresholds` VALUES (16,'check_ratio',NULL,'ratio',NULL,NULL,NULL,NULL,0,'','');
-
   nos_list.sql: |
     USE {{ .Values.mariadb.auth.database }};
     INSERT INTO `nos_list` VALUES (1,'Cumulus Linux','cumulus_linux');
@@ -1583,12 +1582,11 @@ data:
     INSERT INTO `supported_platforms` VALUES (11,'MSN2700|MSN2700-CS2F|MSN2700-CS2R|MSN2700-CS2RC|MSN2700-CS2FC|MSN2700-CS2FO|MSN2700-CS2RO|MSN2700-CBBFO|MSN2700-BS2F|MSN2700-BS2R|MSN2700-BS2FC|MSN2700-BS2FO|MSN2700-BS2RC','Mellanox MSN2700 Spectrum','spectrum',2980,300);
     INSERT INTO `supported_platforms` VALUES (12,'as7326-56x','Edge-Core AS7326-56X T3','trident3',4096,300);
     INSERT INTO `supported_platforms` VALUES (13,'AS7712-32X','Edge-Core AS7712-32X Tomahawk','tomahawk',4096,300);
-  tenants.sql: |+
+  tenants.sql: |
     USE {{ .Values.mariadb.auth.database }};
     SET sql_mode='NO_AUTO_VALUE_ON_ZERO';
-    INSERT INTO `tenants` VALUES (0,'All Tenants',0,0,0,0,0,'region',0,10,0,1,'private','2019-01-17 08:07:23','2020-06-30 23:05:02','');
-    INSERT INTO `tenants` VALUES (1,'Admin',0,0,0,0,0,'region',1,10,0,2,'public','2019-01-15 09:37:34','2020-07-14 19:00:02','');
-
+    INSERT INTO `tenants` VALUES (0,'All Tenants',0,0,0,0,0,'region',0,10,0,'private','2019-01-17 08:07:23','2020-06-30 23:05:02','');
+    INSERT INTO `tenants` VALUES (1,'Admin',0,0,0,0,0,'region',1,10,0,'public','2019-01-15 09:37:34','2020-07-14 19:00:02','');
   users.sql: |
     USE {{ .Values.mariadb.auth.database }};
     INSERT INTO `users` VALUES (1,'{{ .Values.netris.webLogin }}','{{ .Values.netris.webPassword | sha1sum }}','Netris','[email protected]','',NULL,0,'','','Netris',NULL,0,1,'enabled','','', NULL, NULL);

diff --git a/charts/netris-controller/values.yaml b/charts/netris-controller/values.yaml
@@ -59,7 +59,7 @@ app:
     repository: netrisai/controller-web-service
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "3.0.2-011"
+    tag: "3.0.2-013"
 
   imagePullSecrets: []
 
@@ -107,7 +107,7 @@ grpc:
     repository: netrisai/controller-grpc
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "3.0.2.001"
+    tag: "3.0.2.002"
 
   imagePullSecrets: []
 
@@ -131,7 +131,7 @@ telescope:
     repository: netrisai/controller-telescope
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: ""
+    tag: "3.0.2"
 
   imagePullSecrets: []