iguazio.dashboard-controls 0.38.7 → 0.38.10-patch1

package/src/nuclio/functions/functions.component.js

@@ -32,6 +32,10 @@
         var UPDATING_STATISTICS_INTERVAL_TIME = 30000;
 
         ctrl.filtersCounter = 0;
+        ctrl.functionCPUMetric = FunctionsService.functionMetrics.FUNCTION_CPU;
+        ctrl.functionEventsMetric = FunctionsService.functionMetrics.FUNCTION_EVENTS;
+        ctrl.functionGPUMetric = FunctionsService.functionMetrics.FUNCTION_GPU;
+        ctrl.functionMemoryMetric = FunctionsService.functionMetrics.FUNCTION_MEMORY;
         ctrl.functions = [];
         ctrl.originalSortedFunctions = [];
         ctrl.isFiltersShowed = {
@@ -505,10 +509,10 @@
 
             if (!isRefresh) {
                 $timeout(function () {
-                    hideSpinners(FunctionsService.functionMetrics.FUNCTION_CPU);
-                    hideSpinners(FunctionsService.functionMetrics.FUNCTION_GPU);
-                    hideSpinners(FunctionsService.functionMetrics.FUNCTION_MEMORY);
-                    hideSpinners(FunctionsService.functionMetrics.FUNCTION_EVENTS);
+                    hideSpinners(ctrl.functionCPUMetric);
+                    hideSpinners(ctrl.functionGPUMetric);
+                    hideSpinners(ctrl.functionMemoryMetric);
+                    hideSpinners(ctrl.functionEventsMetric);
                 });
             }
         }
@@ -691,31 +695,37 @@
             var now = Date.now();
             var from = new Date(now - MILLIS_IN_AN_HOUR).toISOString();
             var until = new Date(now).toISOString();
+            var functionEventsProjectName = '{project="' + ctrl.project.metadata.name + '"}';
+            var projectName = '{project_name="' + ctrl.project.metadata.name + '"}';
+            var gpuUtilizationMetric = ' * on (pod) group_left(function_name)(nuclio_function_pod_labels{project_name="' +
+                ctrl.project.metadata.name + '"})';
             var args = {
-                metric: FunctionsService.functionMetrics.FUNCTION_EVENTS + '{project="' + ctrl.project.metadata.name + '"}',
+                metric: ctrl.functionEventsMetric + functionEventsProjectName,
                 from: from,
                 until: until,
                 interval: '5m'
             };
 
             ctrl.getStatistics(args)
-                .then(parseData.bind(null, FunctionsService.functionMetrics.FUNCTION_EVENTS))
-                .catch(handleError.bind(null, FunctionsService.functionMetrics.FUNCTION_EVENTS));
+                .then(parseData.bind(null, ctrl.functionEventsMetric))
+                .catch(handleError.bind(null, ctrl.functionEventsMetric));
 
-            args.metric = FunctionsService.functionMetrics.FUNCTION_CPU;
+            args.metric = ctrl.functionCPUMetric + projectName;
             ctrl.getStatistics(args)
-                .then(parseData.bind(null, args.metric))
-                .catch(handleError.bind(null, args.metric));
+                .then(parseData.bind(null, ctrl.functionCPUMetric))
+                .catch(handleError.bind(null, ctrl.functionCPUMetric));
 
-            args.metric = FunctionsService.functionMetrics.FUNCTION_GPU;
+            args.metric = ctrl.functionGPUMetric + gpuUtilizationMetric;
+            args.appendQueryParamsToUrlPath = true;
             ctrl.getStatistics(args)
-                .then(parseData.bind(null, args.metric))
-                .catch(handleError.bind(null, args.metric));
+                .then(parseData.bind(null, ctrl.functionGPUMetric))
+                .catch(handleError.bind(null, ctrl.functionGPUMetric));
+            delete args.appendQueryParamsToUrlPath;
 
-            args.metric = FunctionsService.functionMetrics.FUNCTION_MEMORY;
+            args.metric = ctrl.functionMemoryMetric + projectName;
             ctrl.getStatistics(args)
-                .then(parseData.bind(null, args.metric))
-                .catch(handleError.bind(null, args.metric));
+                .then(parseData.bind(null, ctrl.functionMemoryMetric))
+                .catch(handleError.bind(null, ctrl.functionMemoryMetric));
 
             /**
              * Sets error message to the relevant function
@@ -810,7 +820,7 @@
                                 .value();
                         }
 
-                        if (type === FunctionsService.functionMetrics.FUNCTION_CPU) {
+                        if (type === ctrl.functionCPUMetric) {
                             lodash.merge(aFunction.ui, {
                                 metrics: {
                                     'cpu.cores': latestValue,
@@ -819,7 +829,7 @@
                                     })
                                 }
                             });
-                        } else if (type === FunctionsService.functionMetrics.FUNCTION_MEMORY) {
+                        } else if (type === ctrl.functionMemoryMetric) {
                             lodash.merge(aFunction.ui, {
                                 metrics: {
                                     size: Number(latestValue),
@@ -828,7 +838,7 @@
                                     })
                                 }
                             });
-                        } else if (type === FunctionsService.functionMetrics.FUNCTION_GPU) {
+                        } else if (type === ctrl.functionGPUMetric) {
                             lodash.merge(aFunction.ui, {
                                 metrics: {
                                     'gpu.cores': latestValue,
@@ -853,10 +863,10 @@
                 });
 
                 // if the column values have just been updated, and the table is sorted by this column - update sort
-                if (type === FunctionsService.functionMetrics.FUNCTION_CPU && ctrl.sortedColumnName === 'ui.metrics[\'cpu.cores\']' ||
-                    type === FunctionsService.functionMetrics.FUNCTION_GPU && ctrl.sortedColumnName === 'ui.metrics[\'gpu.cores\']' ||
-                    type === FunctionsService.functionMetrics.FUNCTION_MEMORY && ctrl.sortedColumnName === 'ui.metrics.size' ||
-                    type === FunctionsService.functionMetrics.FUNCTION_EVENTS &&
+                if (type === ctrl.functionCPUMetric && ctrl.sortedColumnName === 'ui.metrics[\'cpu.cores\']' ||
+                    type === ctrl.functionGPUMetric && ctrl.sortedColumnName === 'ui.metrics[\'gpu.cores\']' ||
+                    type === ctrl.functionMemoryMetric && ctrl.sortedColumnName === 'ui.metrics.size' ||
+                    type === ctrl.functionEventsMetric &&
                     lodash.includes(['ui.metrics.invocationPerSec', 'ui.metrics.count'], ctrl.sortedColumnName)) {
                     sortTable();
                 }

package/src/nuclio/functions/functions.service.js

@@ -9,9 +9,7 @@
             checkedItem: '',
             functionMetrics: {
                 FUNCTION_CPU: 'nuclio_function_cpu',
-                FUNCTION_GPU: encodeURI(
-                    'kube_metrics_server_pods_gpu_utilization * on (pod) group_left(function_name)(nuclio_function_pod_labels)'
-                ),
+                FUNCTION_GPU: 'kube_metrics_server_pods_gpu_utilization',
                 FUNCTION_MEMORY: 'nuclio_function_mem',
                 FUNCTION_EVENTS: 'nuclio_processor_handled_events_total'
             },
@@ -539,12 +537,12 @@
                                 defaultValue: lodash.get(
                                     ConfigService,
                                     'nuclio.defaultFunctionConfig.attributes.spec.triggers.v3ioStream.url',
-                                    ''
+                                    'http://v3io-webapi:8081'
                                 ),
                                 placeholder: $i18next.t('common:PLACEHOLDER.ENTER_URL', { lng: lng }),
                                 moreInfoDescription: $i18next.t('functions:TOOLTIP.V3IO_STREAM_URL', { lng: lng }),
                                 moreInfoHtml: true,
-                                isAdvanced: !lodash.isEmpty(lodash.get(additionalData, 'containers')),
+                                isAdvanced: false,
                                 allowEmpty: false
                             },
                             {

package/src/nuclio/functions/version/version-configuration/tabs/version-configuration-environment-variables/version-configuration-environment-variables.component.js

@@ -31,7 +31,7 @@
                 pattern: validateUniqueness.bind(null, 'name')
             }]),
             secretKey: ValidationService.getValidationRules('k8s.configMapKey'),
-            secret: ValidationService.getValidationRules('k8s.dns1123Subdomain'),
+            secret: ValidationService.getValidationRules('k8s.secretName'),
             configmapKey: ValidationService.getValidationRules('k8s.configMapKey', [
                 {
                     name: 'uniqueness',

package/src/nuclio/functions/version/version.component.js

@@ -187,7 +187,8 @@
                         runtimeAttributes: {
                             repositories: []
                         }
-                    }
+                    },
+                    resources: $stateParams.isNewFunction ? lodash.get(ConfigService, 'nuclio.defaultFunctionPodResources', {}) : {}
                 },
                 ui: {
                     versionCode: '',