diff --git a/bin/acl-config b/bin/acl-config index b98ac015e0..9c9f182cd8 100755 --- a/bin/acl-config +++ b/bin/acl-config @@ -1599,9 +1599,6 @@ SQL; foreach ($queryDescriptors as $queryDescriptor) { $realm = isset($queryDescriptor['realm']) ? $queryDescriptor['realm'] : null; - $groupBy = isset($queryDescriptor['group_by']) ? $queryDescriptor['group_by'] : null; - $disable = isset($queryDescriptor['disable']) ? $queryDescriptor['disable'] : false; - // if we can't find the current realm in the array of available realms // then just ignore this entry. This is due to the way in which we // process modules / how the data is represented and is expected. @@ -1609,27 +1606,32 @@ SQL; continue; } + $groupBy = isset($queryDescriptor['group_by']) ? $queryDescriptor['group_by'] : null; + $disable = isset($queryDescriptor['disable']) ? $queryDescriptor['disable'] : false; + $hide = isset($queryDescriptor['hide']) ? $queryDescriptor['hide'] : null; + $realmData = $realms[$realm]; if (!isset($realmData['statistics'])) { $log->warning("No statistics found for realm $realm. Skipping Query Descriptor for [ $module, $acl, $groupBy ]"); continue; } - $statistics = $realmData['statistics']; + $statistics = $realmData['statistics']; foreach ($statistics as $statistic) { $statisticName = isset($statistic['name']) ? $statistic['name'] : null; - $hide = isset($statistic['hide']) ? $statistic['hide'] : null; $visible = isset($statistic['visible']) ? $statistic['visible'] : null; - $enabled = null !== $disable ? !$disable : true; - - if ($visible === null && $hide !== null) { - $visible = !$hide; + // By default, an entry will be shown. + // If the statistic defines a $visible value, then prefer that. + // Else, if the query descriptor has a hide value, use that. + $shown = true; + if (isset($visible)) { + $shown = $visible; + } elseif (!isset($visible) && isset($hide)) { + $shown = !$hide; } - $visible = $visible !== null ? $visible : true; - $realmName = strtolower($realm); $id = "[ $module, $realmName, $acl, $groupBy, $statisticName ]"; @@ -1640,8 +1642,8 @@ SQL; ':acl_name' => $acl, ':group_by_name' => $groupBy, ':statistic_name' => $statisticName, - ':visible' => ( $visible ? 1 : 0 ), - ':enabled' => ( $enabled ? 1 : 0 ) + ':visible' => ( $shown ? 1 : 0 ), + ':enabled' => ( !$disable ? 1 : 0 ) ); $log->debug(json_encode($params)); diff --git a/classes/Models/Services/Acls.php b/classes/Models/Services/Acls.php index 96e5ce8de2..3a834f90c9 100644 --- a/classes/Models/Services/Acls.php +++ b/classes/Models/Services/Acls.php @@ -974,26 +974,20 @@ public static function getAclsByTypeName($aclTypeName) */ public static function getQueryDescripters(XDUser $user, $realmName = null, $groupByName = null, $statisticName = null) { - $selectClauses = array( - 'r.display as realm', - 'gb.name as group_by', - '!agb.enabled as not_enabled' - ); - - if (isset($statisticName)) { - $selectClauses[] = 'agb.visible'; + // This can be removed after we refactor the tables to support more general disabling / hiding. + // The reason it's here is that unless we are specifically filtering on a statistic, having the + // sem* statistics included messes up the results. Specifically, we get duplicate rows + $statisticWhere = ''; + if ($statisticName === null) { + $statisticWhere = "\nAND s.name NOT LIKE 'sem%'"; } - // Note: this type of dynamic sql is safe as we're not including any user defined input - // in the sql itself. - $selectClause = implode( - ",\n", - $selectClauses - ); - $query = <<setDisableMenu((bool)$row['not_enabled']); + $descripter->setShowMenu((bool)$row['visible']); if (isset($statisticName)) { $descripter->setDefaultStatisticName($statisticName); - $descripter->setShowMenu((bool)$row['visible']); } // NOTE: this is done so that the GroupByNone query descripter does not have it's diff --git a/html/controllers/user_interface/get_menus.php b/html/controllers/user_interface/get_menus.php index 190ce4a97b..175d257b9a 100644 --- a/html/controllers/user_interface/get_menus.php +++ b/html/controllers/user_interface/get_menus.php @@ -93,53 +93,52 @@ $user, $realm_name ); + foreach($query_descripter_groups as $groupBy => $queryDescriptorData) { + $queryDescriptor = $queryDescriptorData['all']; - foreach($query_descripter_groups as $realm => $query_descripter_group) { - foreach($query_descripter_group as $query_descripter) { - if ($query_descripter->getShowMenu() !== true) { - continue; - } - - $nodeId = ( - 'group_by_' - . $categoryName - . '_' - . $query_descripter->getGroupByName() - ); - - // Make sure that the nodeText, derived from the query descripters menu - // label, has each instance of $realm_name replaced with $categoryName. - $nodeText = preg_replace( - '/' . preg_quote($realm_name, '/') . '/', - $categoryName, - $query_descripter->getMenuLabel() - ); - - // If this $nodeId has been seen before but for a different realm. Update - // the list of realms associated with this $nodeId - $nodeRealms = ( - isset($categoryReturnData[$nodeId]) - ? $categoryReturnData[$nodeId]['realm'] . ",${realm_name}" - : $realm_name - ); - - $categoryReturnData[$nodeId] = array( - 'text' => $nodeText, - 'id' => $nodeId, - 'group_by' => $query_descripter->getGroupByName(), - 'query_group' => $query_group_name, - 'category' => $categoryName, - 'realm' => $nodeRealms, - 'defaultChartSettings' => $query_descripter->getChartSettings(true), - 'chartSettings' => $query_descripter->getChartSettings(true), - 'node_type' => 'group_by', - 'iconCls' => 'menu', - 'description' => $query_descripter->getGroupByLabel(), - 'leaf' => false - ); - - $hasItems = true; + if ($queryDescriptor->getShowMenu() !== true) { + continue; } + + $nodeId = ( + 'group_by_' + . $categoryName + . '_' + . $queryDescriptor->getGroupByName() + ); + + // Make sure that the nodeText, derived from the query descripters menu + // label, has each instance of $realm_name replaced with $categoryName. + $nodeText = preg_replace( + '/' . preg_quote($realm_name, '/') . '/', + $categoryName, + $queryDescriptor->getMenuLabel() + ); + + // If this $nodeId has been seen before but for a different realm. Update + // the list of realms associated with this $nodeId + $nodeRealms = ( + isset($categoryReturnData[$nodeId]) + ? $categoryReturnData[$nodeId]['realm'] . ",${realm_name}" + : $realm_name + ); + + $categoryReturnData[$nodeId] = array( + 'text' => $nodeText, + 'id' => $nodeId, + 'group_by' => $queryDescriptor->getGroupByName(), + 'query_group' => $query_group_name, + 'category' => $categoryName, + 'realm' => $nodeRealms, + 'defaultChartSettings' => $queryDescriptor->getChartSettings(true), + 'chartSettings' => $queryDescriptor->getChartSettings(true), + 'node_type' => 'group_by', + 'iconCls' => 'menu', + 'description' => $queryDescriptor->getGroupByLabel(), + 'leaf' => false + ); + + $hasItems = true; } } diff --git a/tests/artifacts/xdmod/acls/input/get_disabled_menus.json b/tests/artifacts/xdmod/acls/input/get_disabled_menus.json new file mode 100644 index 0000000000..1d06d48f55 --- /dev/null +++ b/tests/artifacts/xdmod/acls/input/get_disabled_menus.json @@ -0,0 +1,32 @@ +[ + [ + { + "username": "Public User", + "realm": "Jobs" + } + ], + [ + { + "username": "centerdirector", + "realm": "Jobs" + } + ], + [ + { + "username": "centerstaff", + "realm": "Jobs" + } + ], + [ + { + "username": "principal", + "realm": "Jobs" + } + ], + [ + { + "username": "normaluser", + "realm": "Jobs" + } + ] +] diff --git a/tests/artifacts/xdmod/acls/input/get_query_descripters.json b/tests/artifacts/xdmod/acls/input/get_query_descripters.json index 012ab75b54..f9e4ee64e4 100644 --- a/tests/artifacts/xdmod/acls/input/get_query_descripters.json +++ b/tests/artifacts/xdmod/acls/input/get_query_descripters.json @@ -152,51 +152,6 @@ "file_id": "jobs_fieldofscience_running_job_count" } ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "fieldofscience", - "statistic": "sem_avg_cpu_hours", - "file_id": "jobs_fieldofscience_sem_avg_cpu_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "fieldofscience", - "statistic": "sem_avg_node_hours", - "file_id": "jobs_fieldofscience_sem_avg_node_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "fieldofscience", - "statistic": "sem_avg_processors", - "file_id": "jobs_fieldofscience_sem_avg_processors" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "fieldofscience", - "statistic": "sem_avg_waitduration_hours", - "file_id": "jobs_fieldofscience_sem_avg_waitduration_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "fieldofscience", - "statistic": "sem_avg_wallduration_hours", - "file_id": "jobs_fieldofscience_sem_avg_wallduration_hours" - } - ], [ { "username": "principal", @@ -404,51 +359,6 @@ "file_id": "jobs_jobsize_running_job_count" } ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "jobsize", - "statistic": "sem_avg_cpu_hours", - "file_id": "jobs_jobsize_sem_avg_cpu_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "jobsize", - "statistic": "sem_avg_node_hours", - "file_id": "jobs_jobsize_sem_avg_node_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "jobsize", - "statistic": "sem_avg_processors", - "file_id": "jobs_jobsize_sem_avg_processors" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "jobsize", - "statistic": "sem_avg_waitduration_hours", - "file_id": "jobs_jobsize_sem_avg_waitduration_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "jobsize", - "statistic": "sem_avg_wallduration_hours", - "file_id": "jobs_jobsize_sem_avg_wallduration_hours" - } - ], [ { "username": "principal", @@ -656,51 +566,6 @@ "file_id": "jobs_jobwalltime_running_job_count" } ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "jobwalltime", - "statistic": "sem_avg_cpu_hours", - "file_id": "jobs_jobwalltime_sem_avg_cpu_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "jobwalltime", - "statistic": "sem_avg_node_hours", - "file_id": "jobs_jobwalltime_sem_avg_node_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "jobwalltime", - "statistic": "sem_avg_processors", - "file_id": "jobs_jobwalltime_sem_avg_processors" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "jobwalltime", - "statistic": "sem_avg_waitduration_hours", - "file_id": "jobs_jobwalltime_sem_avg_waitduration_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "jobwalltime", - "statistic": "sem_avg_wallduration_hours", - "file_id": "jobs_jobwalltime_sem_avg_wallduration_hours" - } - ], [ { "username": "principal", @@ -908,51 +773,6 @@ "file_id": "jobs_nodecount_running_job_count" } ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "nodecount", - "statistic": "sem_avg_cpu_hours", - "file_id": "jobs_nodecount_sem_avg_cpu_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "nodecount", - "statistic": "sem_avg_node_hours", - "file_id": "jobs_nodecount_sem_avg_node_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "nodecount", - "statistic": "sem_avg_processors", - "file_id": "jobs_nodecount_sem_avg_processors" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "nodecount", - "statistic": "sem_avg_waitduration_hours", - "file_id": "jobs_nodecount_sem_avg_waitduration_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "nodecount", - "statistic": "sem_avg_wallduration_hours", - "file_id": "jobs_nodecount_sem_avg_wallduration_hours" - } - ], [ { "username": "principal", @@ -1160,51 +980,6 @@ "file_id": "jobs_none_running_job_count" } ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "none", - "statistic": "sem_avg_cpu_hours", - "file_id": "jobs_none_sem_avg_cpu_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "none", - "statistic": "sem_avg_node_hours", - "file_id": "jobs_none_sem_avg_node_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "none", - "statistic": "sem_avg_processors", - "file_id": "jobs_none_sem_avg_processors" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "none", - "statistic": "sem_avg_waitduration_hours", - "file_id": "jobs_none_sem_avg_waitduration_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "none", - "statistic": "sem_avg_wallduration_hours", - "file_id": "jobs_none_sem_avg_wallduration_hours" - } - ], [ { "username": "principal", @@ -1412,51 +1187,6 @@ "file_id": "jobs_nsfdirectorate_running_job_count" } ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "nsfdirectorate", - "statistic": "sem_avg_cpu_hours", - "file_id": "jobs_nsfdirectorate_sem_avg_cpu_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "nsfdirectorate", - "statistic": "sem_avg_node_hours", - "file_id": "jobs_nsfdirectorate_sem_avg_node_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "nsfdirectorate", - "statistic": "sem_avg_processors", - "file_id": "jobs_nsfdirectorate_sem_avg_processors" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "nsfdirectorate", - "statistic": "sem_avg_waitduration_hours", - "file_id": "jobs_nsfdirectorate_sem_avg_waitduration_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "nsfdirectorate", - "statistic": "sem_avg_wallduration_hours", - "file_id": "jobs_nsfdirectorate_sem_avg_wallduration_hours" - } - ], [ { "username": "principal", @@ -1664,51 +1394,6 @@ "file_id": "jobs_parentscience_running_job_count" } ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "parentscience", - "statistic": "sem_avg_cpu_hours", - "file_id": "jobs_parentscience_sem_avg_cpu_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "parentscience", - "statistic": "sem_avg_node_hours", - "file_id": "jobs_parentscience_sem_avg_node_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "parentscience", - "statistic": "sem_avg_processors", - "file_id": "jobs_parentscience_sem_avg_processors" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "parentscience", - "statistic": "sem_avg_waitduration_hours", - "file_id": "jobs_parentscience_sem_avg_waitduration_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "parentscience", - "statistic": "sem_avg_wallduration_hours", - "file_id": "jobs_parentscience_sem_avg_wallduration_hours" - } - ], [ { "username": "principal", @@ -1916,51 +1601,6 @@ "file_id": "jobs_person_running_job_count" } ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "person", - "statistic": "sem_avg_cpu_hours", - "file_id": "jobs_person_sem_avg_cpu_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "person", - "statistic": "sem_avg_node_hours", - "file_id": "jobs_person_sem_avg_node_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "person", - "statistic": "sem_avg_processors", - "file_id": "jobs_person_sem_avg_processors" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "person", - "statistic": "sem_avg_waitduration_hours", - "file_id": "jobs_person_sem_avg_waitduration_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "person", - "statistic": "sem_avg_wallduration_hours", - "file_id": "jobs_person_sem_avg_wallduration_hours" - } - ], [ { "username": "principal", @@ -2168,51 +1808,6 @@ "file_id": "jobs_pi_running_job_count" } ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "pi", - "statistic": "sem_avg_cpu_hours", - "file_id": "jobs_pi_sem_avg_cpu_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "pi", - "statistic": "sem_avg_node_hours", - "file_id": "jobs_pi_sem_avg_node_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "pi", - "statistic": "sem_avg_processors", - "file_id": "jobs_pi_sem_avg_processors" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "pi", - "statistic": "sem_avg_waitduration_hours", - "file_id": "jobs_pi_sem_avg_waitduration_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "pi", - "statistic": "sem_avg_wallduration_hours", - "file_id": "jobs_pi_sem_avg_wallduration_hours" - } - ], [ { "username": "principal", @@ -2420,51 +2015,6 @@ "file_id": "jobs_queue_running_job_count" } ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "queue", - "statistic": "sem_avg_cpu_hours", - "file_id": "jobs_queue_sem_avg_cpu_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "queue", - "statistic": "sem_avg_node_hours", - "file_id": "jobs_queue_sem_avg_node_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "queue", - "statistic": "sem_avg_processors", - "file_id": "jobs_queue_sem_avg_processors" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "queue", - "statistic": "sem_avg_waitduration_hours", - "file_id": "jobs_queue_sem_avg_waitduration_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "queue", - "statistic": "sem_avg_wallduration_hours", - "file_id": "jobs_queue_sem_avg_wallduration_hours" - } - ], [ { "username": "principal", @@ -2672,51 +2222,6 @@ "file_id": "jobs_resource_running_job_count" } ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "resource", - "statistic": "sem_avg_cpu_hours", - "file_id": "jobs_resource_sem_avg_cpu_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "resource", - "statistic": "sem_avg_node_hours", - "file_id": "jobs_resource_sem_avg_node_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "resource", - "statistic": "sem_avg_processors", - "file_id": "jobs_resource_sem_avg_processors" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "resource", - "statistic": "sem_avg_waitduration_hours", - "file_id": "jobs_resource_sem_avg_waitduration_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "resource", - "statistic": "sem_avg_wallduration_hours", - "file_id": "jobs_resource_sem_avg_wallduration_hours" - } - ], [ { "username": "principal", @@ -2924,51 +2429,6 @@ "file_id": "jobs_resource_type_running_job_count" } ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "resource_type", - "statistic": "sem_avg_cpu_hours", - "file_id": "jobs_resource_type_sem_avg_cpu_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "resource_type", - "statistic": "sem_avg_node_hours", - "file_id": "jobs_resource_type_sem_avg_node_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "resource_type", - "statistic": "sem_avg_processors", - "file_id": "jobs_resource_type_sem_avg_processors" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "resource_type", - "statistic": "sem_avg_waitduration_hours", - "file_id": "jobs_resource_type_sem_avg_waitduration_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "resource_type", - "statistic": "sem_avg_wallduration_hours", - "file_id": "jobs_resource_type_sem_avg_wallduration_hours" - } - ], [ { "username": "principal", @@ -3176,51 +2636,6 @@ "file_id": "jobs_username_running_job_count" } ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "username", - "statistic": "sem_avg_cpu_hours", - "file_id": "jobs_username_sem_avg_cpu_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "username", - "statistic": "sem_avg_node_hours", - "file_id": "jobs_username_sem_avg_node_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "username", - "statistic": "sem_avg_processors", - "file_id": "jobs_username_sem_avg_processors" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "username", - "statistic": "sem_avg_waitduration_hours", - "file_id": "jobs_username_sem_avg_waitduration_hours" - } - ], - [ - { - "username": "principal", - "realm": "jobs", - "group_by": "username", - "statistic": "sem_avg_wallduration_hours", - "file_id": "jobs_username_sem_avg_wallduration_hours" - } - ], [ { "username": "principal", diff --git a/tests/artifacts/xdmod/acls/output/get_disabled_menus-centerdirector.json b/tests/artifacts/xdmod/acls/output/get_disabled_menus-centerdirector.json new file mode 100644 index 0000000000..41b42e677b --- /dev/null +++ b/tests/artifacts/xdmod/acls/output/get_disabled_menus-centerdirector.json @@ -0,0 +1,3 @@ +[ + +] diff --git a/tests/artifacts/xdmod/acls/output/get_disabled_menus-centerstaff.json b/tests/artifacts/xdmod/acls/output/get_disabled_menus-centerstaff.json new file mode 100644 index 0000000000..41b42e677b --- /dev/null +++ b/tests/artifacts/xdmod/acls/output/get_disabled_menus-centerstaff.json @@ -0,0 +1,3 @@ +[ + +] diff --git a/tests/artifacts/xdmod/acls/output/get_disabled_menus-normaluser.json b/tests/artifacts/xdmod/acls/output/get_disabled_menus-normaluser.json new file mode 100644 index 0000000000..41b42e677b --- /dev/null +++ b/tests/artifacts/xdmod/acls/output/get_disabled_menus-normaluser.json @@ -0,0 +1,3 @@ +[ + +] diff --git a/tests/artifacts/xdmod/acls/output/get_disabled_menus-principal.json b/tests/artifacts/xdmod/acls/output/get_disabled_menus-principal.json new file mode 100644 index 0000000000..41b42e677b --- /dev/null +++ b/tests/artifacts/xdmod/acls/output/get_disabled_menus-principal.json @@ -0,0 +1,3 @@ +[ + +] diff --git a/tests/artifacts/xdmod/acls/output/get_disabled_menus-public_user.json b/tests/artifacts/xdmod/acls/output/get_disabled_menus-public_user.json new file mode 100644 index 0000000000..618cbca5be --- /dev/null +++ b/tests/artifacts/xdmod/acls/output/get_disabled_menus-public_user.json @@ -0,0 +1,7 @@ +[ + { + "id": "group_by_jobs_username", + "group_by": "username", + "realm": "Jobs" + } +] diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_fieldofscience_sem_avg_cpu_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_fieldofscience_sem_avg_cpu_hours.json deleted file mode 100644 index 6f645f7b57..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_fieldofscience_sem_avg_cpu_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "fieldofscience", - "_default_statisticname": "sem_avg_cpu_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_fieldofscience_sem_avg_node_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_fieldofscience_sem_avg_node_hours.json deleted file mode 100644 index daffc050b3..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_fieldofscience_sem_avg_node_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "fieldofscience", - "_default_statisticname": "sem_avg_node_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_fieldofscience_sem_avg_processors.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_fieldofscience_sem_avg_processors.json deleted file mode 100644 index 10b40fba1b..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_fieldofscience_sem_avg_processors.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "fieldofscience", - "_default_statisticname": "sem_avg_processors", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_fieldofscience_sem_avg_waitduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_fieldofscience_sem_avg_waitduration_hours.json deleted file mode 100644 index 0748967820..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_fieldofscience_sem_avg_waitduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "fieldofscience", - "_default_statisticname": "sem_avg_waitduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_fieldofscience_sem_avg_wallduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_fieldofscience_sem_avg_wallduration_hours.json deleted file mode 100644 index 9da202a0e0..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_fieldofscience_sem_avg_wallduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "fieldofscience", - "_default_statisticname": "sem_avg_wallduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobsize_sem_avg_cpu_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobsize_sem_avg_cpu_hours.json deleted file mode 100644 index bcafb24377..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobsize_sem_avg_cpu_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "jobsize", - "_default_statisticname": "sem_avg_cpu_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobsize_sem_avg_node_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobsize_sem_avg_node_hours.json deleted file mode 100644 index e4653f24ca..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobsize_sem_avg_node_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "jobsize", - "_default_statisticname": "sem_avg_node_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobsize_sem_avg_processors.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobsize_sem_avg_processors.json deleted file mode 100644 index 50152a8953..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobsize_sem_avg_processors.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "jobsize", - "_default_statisticname": "sem_avg_processors", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobsize_sem_avg_waitduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobsize_sem_avg_waitduration_hours.json deleted file mode 100644 index 244e5e5c51..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobsize_sem_avg_waitduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "jobsize", - "_default_statisticname": "sem_avg_waitduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobsize_sem_avg_wallduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobsize_sem_avg_wallduration_hours.json deleted file mode 100644 index 5bb0478792..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobsize_sem_avg_wallduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "jobsize", - "_default_statisticname": "sem_avg_wallduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobwalltime_sem_avg_cpu_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobwalltime_sem_avg_cpu_hours.json deleted file mode 100644 index 36653b124c..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobwalltime_sem_avg_cpu_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "jobwalltime", - "_default_statisticname": "sem_avg_cpu_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobwalltime_sem_avg_node_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobwalltime_sem_avg_node_hours.json deleted file mode 100644 index 9aff421718..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobwalltime_sem_avg_node_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "jobwalltime", - "_default_statisticname": "sem_avg_node_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobwalltime_sem_avg_processors.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobwalltime_sem_avg_processors.json deleted file mode 100644 index b5193cc554..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobwalltime_sem_avg_processors.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "jobwalltime", - "_default_statisticname": "sem_avg_processors", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobwalltime_sem_avg_waitduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobwalltime_sem_avg_waitduration_hours.json deleted file mode 100644 index f8761d28a0..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobwalltime_sem_avg_waitduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "jobwalltime", - "_default_statisticname": "sem_avg_waitduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobwalltime_sem_avg_wallduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobwalltime_sem_avg_wallduration_hours.json deleted file mode 100644 index fea89b78bc..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_jobwalltime_sem_avg_wallduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "jobwalltime", - "_default_statisticname": "sem_avg_wallduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nodecount_sem_avg_cpu_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nodecount_sem_avg_cpu_hours.json deleted file mode 100644 index 8da8446f51..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nodecount_sem_avg_cpu_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "nodecount", - "_default_statisticname": "sem_avg_cpu_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nodecount_sem_avg_node_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nodecount_sem_avg_node_hours.json deleted file mode 100644 index 418601b755..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nodecount_sem_avg_node_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "nodecount", - "_default_statisticname": "sem_avg_node_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nodecount_sem_avg_processors.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nodecount_sem_avg_processors.json deleted file mode 100644 index d1804d7d24..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nodecount_sem_avg_processors.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "nodecount", - "_default_statisticname": "sem_avg_processors", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nodecount_sem_avg_waitduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nodecount_sem_avg_waitduration_hours.json deleted file mode 100644 index b30cd2ed65..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nodecount_sem_avg_waitduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "nodecount", - "_default_statisticname": "sem_avg_waitduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nodecount_sem_avg_wallduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nodecount_sem_avg_wallduration_hours.json deleted file mode 100644 index c918e786e9..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nodecount_sem_avg_wallduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "nodecount", - "_default_statisticname": "sem_avg_wallduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_none_sem_avg_cpu_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_none_sem_avg_cpu_hours.json deleted file mode 100644 index c4ec149fd2..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_none_sem_avg_cpu_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "none", - "_default_statisticname": "sem_avg_cpu_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_none_sem_avg_node_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_none_sem_avg_node_hours.json deleted file mode 100644 index 5aa3487197..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_none_sem_avg_node_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "none", - "_default_statisticname": "sem_avg_node_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_none_sem_avg_processors.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_none_sem_avg_processors.json deleted file mode 100644 index fd420d4fd5..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_none_sem_avg_processors.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "none", - "_default_statisticname": "sem_avg_processors", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_none_sem_avg_waitduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_none_sem_avg_waitduration_hours.json deleted file mode 100644 index 6516582378..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_none_sem_avg_waitduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "none", - "_default_statisticname": "sem_avg_waitduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_none_sem_avg_wallduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_none_sem_avg_wallduration_hours.json deleted file mode 100644 index caeaf1faf7..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_none_sem_avg_wallduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "none", - "_default_statisticname": "sem_avg_wallduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nsfdirectorate_sem_avg_cpu_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nsfdirectorate_sem_avg_cpu_hours.json deleted file mode 100644 index 991ba47345..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nsfdirectorate_sem_avg_cpu_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "nsfdirectorate", - "_default_statisticname": "sem_avg_cpu_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nsfdirectorate_sem_avg_node_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nsfdirectorate_sem_avg_node_hours.json deleted file mode 100644 index d9bbde13f3..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nsfdirectorate_sem_avg_node_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "nsfdirectorate", - "_default_statisticname": "sem_avg_node_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nsfdirectorate_sem_avg_processors.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nsfdirectorate_sem_avg_processors.json deleted file mode 100644 index 4b3dede69b..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nsfdirectorate_sem_avg_processors.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "nsfdirectorate", - "_default_statisticname": "sem_avg_processors", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nsfdirectorate_sem_avg_waitduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nsfdirectorate_sem_avg_waitduration_hours.json deleted file mode 100644 index b6487da5b2..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nsfdirectorate_sem_avg_waitduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "nsfdirectorate", - "_default_statisticname": "sem_avg_waitduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nsfdirectorate_sem_avg_wallduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nsfdirectorate_sem_avg_wallduration_hours.json deleted file mode 100644 index d8cbff1917..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_nsfdirectorate_sem_avg_wallduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "nsfdirectorate", - "_default_statisticname": "sem_avg_wallduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_parentscience_sem_avg_cpu_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_parentscience_sem_avg_cpu_hours.json deleted file mode 100644 index 452c257bd6..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_parentscience_sem_avg_cpu_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "parentscience", - "_default_statisticname": "sem_avg_cpu_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_parentscience_sem_avg_node_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_parentscience_sem_avg_node_hours.json deleted file mode 100644 index 91fdd4d4e0..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_parentscience_sem_avg_node_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "parentscience", - "_default_statisticname": "sem_avg_node_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_parentscience_sem_avg_processors.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_parentscience_sem_avg_processors.json deleted file mode 100644 index cb117c6aa3..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_parentscience_sem_avg_processors.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "parentscience", - "_default_statisticname": "sem_avg_processors", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_parentscience_sem_avg_waitduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_parentscience_sem_avg_waitduration_hours.json deleted file mode 100644 index 2c6d71fcdf..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_parentscience_sem_avg_waitduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "parentscience", - "_default_statisticname": "sem_avg_waitduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_parentscience_sem_avg_wallduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_parentscience_sem_avg_wallduration_hours.json deleted file mode 100644 index d5d4e84b0c..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_parentscience_sem_avg_wallduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "parentscience", - "_default_statisticname": "sem_avg_wallduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_person_sem_avg_cpu_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_person_sem_avg_cpu_hours.json deleted file mode 100644 index c49e76e3ca..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_person_sem_avg_cpu_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "person", - "_default_statisticname": "sem_avg_cpu_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_person_sem_avg_node_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_person_sem_avg_node_hours.json deleted file mode 100644 index 727c2c38bf..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_person_sem_avg_node_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "person", - "_default_statisticname": "sem_avg_node_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_person_sem_avg_processors.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_person_sem_avg_processors.json deleted file mode 100644 index 4405578645..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_person_sem_avg_processors.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "person", - "_default_statisticname": "sem_avg_processors", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_person_sem_avg_waitduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_person_sem_avg_waitduration_hours.json deleted file mode 100644 index e52f39d4f5..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_person_sem_avg_waitduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "person", - "_default_statisticname": "sem_avg_waitduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_person_sem_avg_wallduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_person_sem_avg_wallduration_hours.json deleted file mode 100644 index a2f9ba3d76..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_person_sem_avg_wallduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "person", - "_default_statisticname": "sem_avg_wallduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_pi_sem_avg_cpu_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_pi_sem_avg_cpu_hours.json deleted file mode 100644 index 92a68df685..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_pi_sem_avg_cpu_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "pi", - "_default_statisticname": "sem_avg_cpu_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_pi_sem_avg_node_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_pi_sem_avg_node_hours.json deleted file mode 100644 index df2dd7c12a..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_pi_sem_avg_node_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "pi", - "_default_statisticname": "sem_avg_node_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_pi_sem_avg_processors.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_pi_sem_avg_processors.json deleted file mode 100644 index 7200be328a..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_pi_sem_avg_processors.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "pi", - "_default_statisticname": "sem_avg_processors", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_pi_sem_avg_waitduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_pi_sem_avg_waitduration_hours.json deleted file mode 100644 index acad59a7cb..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_pi_sem_avg_waitduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "pi", - "_default_statisticname": "sem_avg_waitduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_pi_sem_avg_wallduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_pi_sem_avg_wallduration_hours.json deleted file mode 100644 index 55a33d913b..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_pi_sem_avg_wallduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "pi", - "_default_statisticname": "sem_avg_wallduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_queue_sem_avg_cpu_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_queue_sem_avg_cpu_hours.json deleted file mode 100644 index 12a88bac97..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_queue_sem_avg_cpu_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "queue", - "_default_statisticname": "sem_avg_cpu_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_queue_sem_avg_node_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_queue_sem_avg_node_hours.json deleted file mode 100644 index e177ab8782..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_queue_sem_avg_node_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "queue", - "_default_statisticname": "sem_avg_node_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_queue_sem_avg_processors.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_queue_sem_avg_processors.json deleted file mode 100644 index d04c0e8aff..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_queue_sem_avg_processors.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "queue", - "_default_statisticname": "sem_avg_processors", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_queue_sem_avg_waitduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_queue_sem_avg_waitduration_hours.json deleted file mode 100644 index 7145d473f3..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_queue_sem_avg_waitduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "queue", - "_default_statisticname": "sem_avg_waitduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_queue_sem_avg_wallduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_queue_sem_avg_wallduration_hours.json deleted file mode 100644 index 5784d46d97..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_queue_sem_avg_wallduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "queue", - "_default_statisticname": "sem_avg_wallduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_sem_avg_cpu_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_sem_avg_cpu_hours.json deleted file mode 100644 index 11745a08ca..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_sem_avg_cpu_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "resource", - "_default_statisticname": "sem_avg_cpu_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_sem_avg_node_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_sem_avg_node_hours.json deleted file mode 100644 index 672a8e5d7c..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_sem_avg_node_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "resource", - "_default_statisticname": "sem_avg_node_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_sem_avg_processors.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_sem_avg_processors.json deleted file mode 100644 index 0fc635986d..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_sem_avg_processors.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "resource", - "_default_statisticname": "sem_avg_processors", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_sem_avg_waitduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_sem_avg_waitduration_hours.json deleted file mode 100644 index d6c84ac0a9..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_sem_avg_waitduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "resource", - "_default_statisticname": "sem_avg_waitduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_sem_avg_wallduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_sem_avg_wallduration_hours.json deleted file mode 100644 index 5e3cd29483..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_sem_avg_wallduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "resource", - "_default_statisticname": "sem_avg_wallduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_type_sem_avg_cpu_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_type_sem_avg_cpu_hours.json deleted file mode 100644 index 760dc9112c..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_type_sem_avg_cpu_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "resource_type", - "_default_statisticname": "sem_avg_cpu_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_type_sem_avg_node_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_type_sem_avg_node_hours.json deleted file mode 100644 index 6656be8467..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_type_sem_avg_node_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "resource_type", - "_default_statisticname": "sem_avg_node_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_type_sem_avg_processors.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_type_sem_avg_processors.json deleted file mode 100644 index 0aa44b829c..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_type_sem_avg_processors.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "resource_type", - "_default_statisticname": "sem_avg_processors", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_type_sem_avg_waitduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_type_sem_avg_waitduration_hours.json deleted file mode 100644 index 0ce5b7c462..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_type_sem_avg_waitduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "resource_type", - "_default_statisticname": "sem_avg_waitduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_type_sem_avg_wallduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_type_sem_avg_wallduration_hours.json deleted file mode 100644 index 236af8824d..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_resource_type_sem_avg_wallduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "resource_type", - "_default_statisticname": "sem_avg_wallduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_username_sem_avg_cpu_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_username_sem_avg_cpu_hours.json deleted file mode 100644 index 25529a26bc..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_username_sem_avg_cpu_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "username", - "_default_statisticname": "sem_avg_cpu_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_username_sem_avg_node_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_username_sem_avg_node_hours.json deleted file mode 100644 index 42ed410f8b..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_username_sem_avg_node_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "username", - "_default_statisticname": "sem_avg_node_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_username_sem_avg_processors.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_username_sem_avg_processors.json deleted file mode 100644 index c011bf252f..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_username_sem_avg_processors.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "username", - "_default_statisticname": "sem_avg_processors", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_username_sem_avg_waitduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_username_sem_avg_waitduration_hours.json deleted file mode 100644 index d06dab11cd..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_username_sem_avg_waitduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "username", - "_default_statisticname": "sem_avg_waitduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_username_sem_avg_wallduration_hours.json b/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_username_sem_avg_wallduration_hours.json deleted file mode 100644 index 99102979ba..0000000000 --- a/tests/artifacts/xdmod/acls/output/get_query_descripters-jobs_username_sem_avg_wallduration_hours.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_realm_name": "Jobs", - "_group_by_name": "username", - "_default_statisticname": "sem_avg_wallduration_hours", - "_order_id": 0, - "_show_menu": false, - "_disable_menu": false -} diff --git a/tests/artifacts/xdmod/etlv2/dataendpoint/input/directory_scanner/euca_2017-06-01.json b/tests/artifacts/xdmod/etlv2/dataendpoint/input/directory_scanner/euca_2017-06-01.json index 60aa3f0646..9c2521ab79 100644 --- a/tests/artifacts/xdmod/etlv2/dataendpoint/input/directory_scanner/euca_2017-06-01.json +++ b/tests/artifacts/xdmod/etlv2/dataendpoint/input/directory_scanner/euca_2017-06-01.json @@ -1,120 +1,4 @@ -{ - "node_controller": null, - "public_ip": null, - "account": "000048934329", - "event_type": "STATE_REPORT", - "event_time": "2017-05-16T03:55:04Z", - "instance_type": { - "name": "c1.medium", - "cpu": "4", - "memory": "16384", - "disk": "40", - "networkInterfaces": "2" - }, - "image_type": "emi-521695e8", - "instance_id": "i-cb13943e", - "record_type": "ADMINISTRATIVE", - "block_devices": [ - { - "account": "big", - "attach_time": "2017-04-19T13:47:38.609Z", - "backing": "ebs", - "create_time": "2017-04-19T13:47:38.550Z", - "user": "tyearke", - "id": "vol-6a9b5bc2", - "size": "40" - } - ], - "private_ip": null, - "root_type": "ebs" -} -{ - "node_controller": "172.17.0.31", - "public_ip": "199.109.192.61", - "account": "000669660540", - "event_type": "STATE_REPORT", - "event_time": "2017-05-16T03:55:04Z", - "instance_type": { - "name": "m1.medium", - "cpu": "2", - "memory": "4096", - "disk": "20", - "networkInterfaces": "2" - }, - "image_type": "emi-3f83abf8", - "instance_id": "i-dd04e6bf", - "record_type": "ADMINISTRATIVE", - "block_devices": [ - { - "account": "redfly", - "attach_time": "2017-03-21T16:57:45.376Z", - "backing": "ebs", - "create_time": "2017-03-21T16:57:45.330Z", - "user": "riveraj", - "id": "vol-dae393e0", - "size": "10" - } - ], - "private_ip": "172.17.47.126", - "root_type": "ebs" -} -{ - "node_controller": null, - "public_ip": null, - "account": "000048934329", - "event_type": "STATE_REPORT", - "event_time": "2017-05-16T03:55:04Z", - "instance_type": { - "name": "c1.medium", - "cpu": "4", - "memory": "16384", - "disk": "40", - "networkInterfaces": "2" - }, - "image_type": "emi-521695e8", - "instance_id": "i-cb13943e", - "record_type": "ADMINISTRATIVE", - "block_devices": [ - { - "account": "big", - "attach_time": "2017-04-19T13:47:38.609Z", - "backing": "ebs", - "create_time": "2017-04-19T13:47:38.550Z", - "user": "tyearke", - "id": "vol-6a9b5bc2", - "size": "40" - } - ], - "private_ip": null, - "root_type": "ebs" -} -{ - "node_controller": "172.17.0.31", - "public_ip": "199.109.192.61", - "account": "000669660540", - "event_type": "STATE_REPORT", - "event_time": "2017-05-16T03:55:04Z", - "instance_type": { - "name": "m1.medium", - "cpu": "2", - "memory": "4096", - "disk": "20", - "networkInterfaces": "2" - }, - "image_type": "emi-3f83abf8", - "instance_id": "i-dd04e6bf", - "record_type": "ADMINISTRATIVE", - "block_devices": [ - { - "account": "redfly", - "attach_time": "2017-03-21T16:57:45.376Z", - "backing": "ebs", - "create_time": "2017-03-21T16:57:45.330Z", - "user": "riveraj", - "id": "vol-dae393e0", - "size": "10" - } - ], - "private_ip": "172.17.47.126", - "root_type": "ebs" -} +{"node_controller": null, "public_ip": null, "account": "000048934329", "event_type": "STATE_REPORT", "event_time": "2017-05-16T03:55:04Z", "instance_type": {"name": "c1.medium", "cpu": "4", "memory": "16384", "disk": "40", "networkInterfaces": "2"}, "image_type": "emi-521695e8", "instance_id": "i-cb13943e", "record_type": "ADMINISTRATIVE", "block_devices": [{"account": "big", "attach_time": "2017-04-19T13:47:38.609Z", "backing": "ebs", "create_time": "2017-04-19T13:47:38.550Z", "user": "tyearke", "id": "vol-6a9b5bc2", "size": "40"}], "private_ip": null, "root_type": "ebs"} +{"node_controller": "172.17.0.31", "public_ip": "199.109.192.61", "account": "000669660540", "event_type": "STATE_REPORT", "event_time": "2017-05-16T03:55:04Z", "instance_type": {"name": "m1.medium", "cpu": "2", "memory": "4096", "disk": "20", "networkInterfaces": "2"}, "image_type": "emi-3f83abf8", "instance_id": "i-dd04e6bf", "record_type": "ADMINISTRATIVE", "block_devices": [{"account": "redfly", "attach_time": "2017-03-21T16:57:45.376Z", "backing": "ebs", "create_time": "2017-03-21T16:57:45.330Z", "user": "riveraj", "id": "vol-dae393e0", "size": "10"}], "private_ip": "172.17.47.126", "root_type": "ebs"} +{"node_controller": null, "public_ip": null, "account": "000048934329", "event_type": "STATE_REPORT", "event_time": "2017-05-16T03:55:04Z", "instance_type": {"name": "c1.medium", "cpu": "4", "memory": "16384", "disk": "40", "networkInterfaces": "2"}, "image_type": "emi-521695e8", "instance_id": "i-cb13943e", "record_type": "ADMINISTRATIVE", "block_devices": [{"account": "big", "attach_time": "2017-04-19T13:47:38.609Z", "backing": "ebs", "create_time": "2017-04-19T13:47:38.550Z", "user": "tyearke", "id": "vol-6a9b5bc2", "size": "40"}], "private_ip": null, "root_type": "ebs"} +{"node_controller": "172.17.0.31", "public_ip": "199.109.192.61", "account": "000669660540", "event_type": "STATE_REPORT", "event_time": "2017-05-16T03:55:04Z", "instance_type": {"name": "m1.medium", "cpu": "2", "memory": "4096", "disk": "20", "networkInterfaces": "2"}, "image_type": "emi-3f83abf8", "instance_id": "i-dd04e6bf", "record_type": "ADMINISTRATIVE", "block_devices": [{"account": "redfly", "attach_time": "2017-03-21T16:57:45.376Z", "backing": "ebs", "create_time": "2017-03-21T16:57:45.330Z", "user": "riveraj", "id": "vol-dae393e0", "size": "10"}], "private_ip": "172.17.47.126", "root_type": "ebs"} diff --git a/tests/artifacts/xdmod/etlv2/dataendpoint/input/directory_scanner/euca_acct1.json b/tests/artifacts/xdmod/etlv2/dataendpoint/input/directory_scanner/euca_acct1.json index eeb2653fad..dad3a7e9f8 100644 --- a/tests/artifacts/xdmod/etlv2/dataendpoint/input/directory_scanner/euca_acct1.json +++ b/tests/artifacts/xdmod/etlv2/dataendpoint/input/directory_scanner/euca_acct1.json @@ -1,60 +1,2 @@ -{ - "node_controller": null, - "public_ip": null, - "account": "000048934329", - "event_type": "STATE_REPORT", - "event_time": "2017-05-16T03:55:04Z", - "instance_type": { - "name": "c1.medium", - "cpu": "4", - "memory": "16384", - "disk": "40", - "networkInterfaces": "2" - }, - "image_type": "emi-521695e8", - "instance_id": "i-cb13943e", - "record_type": "ADMINISTRATIVE", - "block_devices": [ - { - "account": "big", - "attach_time": "2017-04-19T13:47:38.609Z", - "backing": "ebs", - "create_time": "2017-04-19T13:47:38.550Z", - "user": "tyearke", - "id": "vol-6a9b5bc2", - "size": "40" - } - ], - "private_ip": null, - "root_type": "ebs" -} -{ - "node_controller": "172.17.0.31", - "public_ip": "199.109.192.61", - "account": "000669660540", - "event_type": "STATE_REPORT", - "event_time": "2017-05-16T03:55:04Z", - "instance_type": { - "name": "m1.medium", - "cpu": "2", - "memory": "4096", - "disk": "20", - "networkInterfaces": "2" - }, - "image_type": "emi-3f83abf8", - "instance_id": "i-dd04e6bf", - "record_type": "ADMINISTRATIVE", - "block_devices": [ - { - "account": "redfly", - "attach_time": "2017-03-21T16:57:45.376Z", - "backing": "ebs", - "create_time": "2017-03-21T16:57:45.330Z", - "user": "riveraj", - "id": "vol-dae393e0", - "size": "10" - } - ], - "private_ip": "172.17.47.126", - "root_type": "ebs" -} +{"node_controller": null, "public_ip": null, "account": "000048934329", "event_type": "STATE_REPORT", "event_time": "2017-05-16T03:55:04Z", "instance_type": {"name": "c1.medium", "cpu": "4", "memory": "16384", "disk": "40", "networkInterfaces": "2"}, "image_type": "emi-521695e8", "instance_id": "i-cb13943e", "record_type": "ADMINISTRATIVE", "block_devices": [{"account": "big", "attach_time": "2017-04-19T13:47:38.609Z", "backing": "ebs", "create_time": "2017-04-19T13:47:38.550Z", "user": "tyearke", "id": "vol-6a9b5bc2", "size": "40"}], "private_ip": null, "root_type": "ebs"} +{"node_controller": "172.17.0.31", "public_ip": "199.109.192.61", "account": "000669660540", "event_type": "STATE_REPORT", "event_time": "2017-05-16T03:55:04Z", "instance_type": {"name": "m1.medium", "cpu": "2", "memory": "4096", "disk": "20", "networkInterfaces": "2"}, "image_type": "emi-3f83abf8", "instance_id": "i-dd04e6bf", "record_type": "ADMINISTRATIVE", "block_devices": [{"account": "redfly", "attach_time": "2017-03-21T16:57:45.376Z", "backing": "ebs", "create_time": "2017-03-21T16:57:45.330Z", "user": "riveraj", "id": "vol-dae393e0", "size": "10"}], "private_ip": "172.17.47.126", "root_type": "ebs"} diff --git a/tests/artifacts/xdmod/etlv2/dataendpoint/input/euca_acct.json b/tests/artifacts/xdmod/etlv2/dataendpoint/input/euca_acct.json index eeb2653fad..dad3a7e9f8 100644 --- a/tests/artifacts/xdmod/etlv2/dataendpoint/input/euca_acct.json +++ b/tests/artifacts/xdmod/etlv2/dataendpoint/input/euca_acct.json @@ -1,60 +1,2 @@ -{ - "node_controller": null, - "public_ip": null, - "account": "000048934329", - "event_type": "STATE_REPORT", - "event_time": "2017-05-16T03:55:04Z", - "instance_type": { - "name": "c1.medium", - "cpu": "4", - "memory": "16384", - "disk": "40", - "networkInterfaces": "2" - }, - "image_type": "emi-521695e8", - "instance_id": "i-cb13943e", - "record_type": "ADMINISTRATIVE", - "block_devices": [ - { - "account": "big", - "attach_time": "2017-04-19T13:47:38.609Z", - "backing": "ebs", - "create_time": "2017-04-19T13:47:38.550Z", - "user": "tyearke", - "id": "vol-6a9b5bc2", - "size": "40" - } - ], - "private_ip": null, - "root_type": "ebs" -} -{ - "node_controller": "172.17.0.31", - "public_ip": "199.109.192.61", - "account": "000669660540", - "event_type": "STATE_REPORT", - "event_time": "2017-05-16T03:55:04Z", - "instance_type": { - "name": "m1.medium", - "cpu": "2", - "memory": "4096", - "disk": "20", - "networkInterfaces": "2" - }, - "image_type": "emi-3f83abf8", - "instance_id": "i-dd04e6bf", - "record_type": "ADMINISTRATIVE", - "block_devices": [ - { - "account": "redfly", - "attach_time": "2017-03-21T16:57:45.376Z", - "backing": "ebs", - "create_time": "2017-03-21T16:57:45.330Z", - "user": "riveraj", - "id": "vol-dae393e0", - "size": "10" - } - ], - "private_ip": "172.17.47.126", - "root_type": "ebs" -} +{"node_controller": null, "public_ip": null, "account": "000048934329", "event_type": "STATE_REPORT", "event_time": "2017-05-16T03:55:04Z", "instance_type": {"name": "c1.medium", "cpu": "4", "memory": "16384", "disk": "40", "networkInterfaces": "2"}, "image_type": "emi-521695e8", "instance_id": "i-cb13943e", "record_type": "ADMINISTRATIVE", "block_devices": [{"account": "big", "attach_time": "2017-04-19T13:47:38.609Z", "backing": "ebs", "create_time": "2017-04-19T13:47:38.550Z", "user": "tyearke", "id": "vol-6a9b5bc2", "size": "40"}], "private_ip": null, "root_type": "ebs"} +{"node_controller": "172.17.0.31", "public_ip": "199.109.192.61", "account": "000669660540", "event_type": "STATE_REPORT", "event_time": "2017-05-16T03:55:04Z", "instance_type": {"name": "m1.medium", "cpu": "2", "memory": "4096", "disk": "20", "networkInterfaces": "2"}, "image_type": "emi-3f83abf8", "instance_id": "i-dd04e6bf", "record_type": "ADMINISTRATIVE", "block_devices": [{"account": "redfly", "attach_time": "2017-03-21T16:57:45.376Z", "backing": "ebs", "create_time": "2017-03-21T16:57:45.330Z", "user": "riveraj", "id": "vol-dae393e0", "size": "10"}], "private_ip": "172.17.47.126", "root_type": "ebs"} diff --git a/tests/artifacts/xdmod/user_interface/input/get_menus.json b/tests/artifacts/xdmod/user_interface/input/get_menus.json new file mode 100644 index 0000000000..a1af97d1fb --- /dev/null +++ b/tests/artifacts/xdmod/user_interface/input/get_menus.json @@ -0,0 +1,44 @@ +[ + [ + { + "user": "pub", + "data": { + "public_user": "true", + "node": "category_" + } + } + ], + [ + { + "user": "usr", + "data": { + "node": "category_" + } + } + ], + [ + { + "user": "pi", + "data": { + "node": "category_" + } + } + ], + [ + { + "user": "cs", + "data": { + "node": "category_" + } + } + ], + [ + { + "user": "cd", + "data": { + "public_user": true, + "node": "category_" + } + } + ] +] diff --git a/tests/artifacts/xdmod/user_interface/output/cd-get_menus.json b/tests/artifacts/xdmod/user_interface/output/cd-get_menus.json new file mode 100644 index 0000000000..40ffab3ab5 --- /dev/null +++ b/tests/artifacts/xdmod/user_interface/output/cd-get_menus.json @@ -0,0 +1,488 @@ +[ + { + "text": "Jobs Summary", + "id": "group_by_Jobs_none", + "group_by": "none", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Screwdriver", + "leaf": false + }, + { + "text": "Jobs by Decanal Unit", + "id": "group_by_Jobs_nsfdirectorate", + "group_by": "nsfdirectorate", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Decanal Unit", + "leaf": false + }, + { + "text": "Jobs by Department", + "id": "group_by_Jobs_parentscience", + "group_by": "parentscience", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Department", + "leaf": false + }, + { + "text": "Jobs by Job Size", + "id": "group_by_Jobs_jobsize", + "group_by": "jobsize", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Job Size", + "leaf": false + }, + { + "text": "Jobs by Job Wait Time", + "id": "group_by_Jobs_jobwaittime", + "group_by": "jobwaittime", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Job Wait Time", + "leaf": false + }, + { + "text": "Jobs by Job Wall Time", + "id": "group_by_Jobs_jobwalltime", + "group_by": "jobwalltime", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Job Wall Time", + "leaf": false + }, + { + "text": "Jobs by Node Count", + "id": "group_by_Jobs_nodecount", + "group_by": "nodecount", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Node Count", + "leaf": false + }, + { + "text": "Jobs by PI", + "id": "group_by_Jobs_pi", + "group_by": "pi", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI", + "leaf": false + }, + { + "text": "Jobs by PI Group", + "id": "group_by_Jobs_fieldofscience", + "group_by": "fieldofscience", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI Group", + "leaf": false + }, + { + "text": "Jobs by Queue", + "id": "group_by_Jobs_queue", + "group_by": "queue", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Queue", + "leaf": false + }, + { + "text": "Jobs by Resource", + "id": "group_by_Jobs_resource", + "group_by": "resource", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource", + "leaf": false + }, + { + "text": "Jobs by Resource Type", + "id": "group_by_Jobs_resource_type", + "group_by": "resource_type", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource Type", + "leaf": false + }, + { + "text": "Jobs by System Username", + "id": "group_by_Jobs_username", + "group_by": "username", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "System Username", + "leaf": false + }, + { + "text": "Jobs by User", + "id": "group_by_Jobs_person", + "group_by": "person", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "User", + "leaf": false + }, + { + "text": "", + "id": "-111", + "node_type": "separator", + "iconCls": "blank", + "leaf": true, + "disabled": true + }, + { + "text": "Storage Summary", + "id": "group_by_Storage_none", + "group_by": "none", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Screwdriver", + "leaf": false + }, + { + "text": "Storage by Decanal Unit", + "id": "group_by_Storage_nsfdirectorate", + "group_by": "nsfdirectorate", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Decanal Unit", + "leaf": false + }, + { + "text": "Storage by Department", + "id": "group_by_Storage_parentscience", + "group_by": "parentscience", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Department", + "leaf": false + }, + { + "text": "Storage by Mountpoint", + "id": "group_by_Storage_mountpoint", + "group_by": "mountpoint", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Mountpoint", + "leaf": false + }, + { + "text": "Storage by PI", + "id": "group_by_Storage_pi", + "group_by": "pi", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI", + "leaf": false + }, + { + "text": "Storage by PI Group", + "id": "group_by_Storage_fieldofscience", + "group_by": "fieldofscience", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI Group", + "leaf": false + }, + { + "text": "Storage by Resource", + "id": "group_by_Storage_resource", + "group_by": "resource", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource", + "leaf": false + }, + { + "text": "Storage by Resource Type", + "id": "group_by_Storage_resource_type", + "group_by": "resource_type", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource Type", + "leaf": false + }, + { + "text": "Storage by System Username", + "id": "group_by_Storage_username", + "group_by": "username", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "System Username", + "leaf": false + }, + { + "text": "Storage by User", + "id": "group_by_Storage_person", + "group_by": "person", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "User", + "leaf": false + }, + { + "text": "", + "id": "-111", + "node_type": "separator", + "iconCls": "blank", + "leaf": true, + "disabled": true + }, + { + "text": "Cloud Summary", + "id": "group_by_Cloud_none", + "group_by": "none", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Screwdriver", + "leaf": false + }, + { + "text": "Cloud by Instance Type", + "id": "group_by_Cloud_configuration", + "group_by": "configuration", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Instance Type", + "leaf": false + }, + { + "text": "Cloud by Project", + "id": "group_by_Cloud_project", + "group_by": "project", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Project", + "leaf": false + }, + { + "text": "Cloud by Resource", + "id": "group_by_Cloud_resource", + "group_by": "resource", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource", + "leaf": false + }, + { + "text": "Cloud by Submission Venue", + "id": "group_by_Cloud_submission_venue", + "group_by": "submission_venue", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Submission Venue", + "leaf": false + }, + { + "text": "Cloud by System Username", + "id": "group_by_Cloud_username", + "group_by": "username", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "System Username", + "leaf": false + }, + { + "text": "Cloud by User", + "id": "group_by_Cloud_person", + "group_by": "person", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "User", + "leaf": false + }, + { + "text": "Cloud by VM Size: Cores", + "id": "group_by_Cloud_vm_size", + "group_by": "vm_size", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "VM Size: Cores", + "leaf": false + }, + { + "text": "Cloud by VM Size: Memory", + "id": "group_by_Cloud_vm_size_memory", + "group_by": "vm_size_memory", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "VM Size: Memory", + "leaf": false + }, + { + "text": "", + "id": "-111", + "node_type": "separator", + "iconCls": "blank", + "leaf": true, + "disabled": true + } +] diff --git a/tests/artifacts/xdmod/user_interface/output/cs-get_menus.json b/tests/artifacts/xdmod/user_interface/output/cs-get_menus.json new file mode 100644 index 0000000000..40ffab3ab5 --- /dev/null +++ b/tests/artifacts/xdmod/user_interface/output/cs-get_menus.json @@ -0,0 +1,488 @@ +[ + { + "text": "Jobs Summary", + "id": "group_by_Jobs_none", + "group_by": "none", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Screwdriver", + "leaf": false + }, + { + "text": "Jobs by Decanal Unit", + "id": "group_by_Jobs_nsfdirectorate", + "group_by": "nsfdirectorate", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Decanal Unit", + "leaf": false + }, + { + "text": "Jobs by Department", + "id": "group_by_Jobs_parentscience", + "group_by": "parentscience", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Department", + "leaf": false + }, + { + "text": "Jobs by Job Size", + "id": "group_by_Jobs_jobsize", + "group_by": "jobsize", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Job Size", + "leaf": false + }, + { + "text": "Jobs by Job Wait Time", + "id": "group_by_Jobs_jobwaittime", + "group_by": "jobwaittime", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Job Wait Time", + "leaf": false + }, + { + "text": "Jobs by Job Wall Time", + "id": "group_by_Jobs_jobwalltime", + "group_by": "jobwalltime", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Job Wall Time", + "leaf": false + }, + { + "text": "Jobs by Node Count", + "id": "group_by_Jobs_nodecount", + "group_by": "nodecount", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Node Count", + "leaf": false + }, + { + "text": "Jobs by PI", + "id": "group_by_Jobs_pi", + "group_by": "pi", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI", + "leaf": false + }, + { + "text": "Jobs by PI Group", + "id": "group_by_Jobs_fieldofscience", + "group_by": "fieldofscience", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI Group", + "leaf": false + }, + { + "text": "Jobs by Queue", + "id": "group_by_Jobs_queue", + "group_by": "queue", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Queue", + "leaf": false + }, + { + "text": "Jobs by Resource", + "id": "group_by_Jobs_resource", + "group_by": "resource", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource", + "leaf": false + }, + { + "text": "Jobs by Resource Type", + "id": "group_by_Jobs_resource_type", + "group_by": "resource_type", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource Type", + "leaf": false + }, + { + "text": "Jobs by System Username", + "id": "group_by_Jobs_username", + "group_by": "username", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "System Username", + "leaf": false + }, + { + "text": "Jobs by User", + "id": "group_by_Jobs_person", + "group_by": "person", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "User", + "leaf": false + }, + { + "text": "", + "id": "-111", + "node_type": "separator", + "iconCls": "blank", + "leaf": true, + "disabled": true + }, + { + "text": "Storage Summary", + "id": "group_by_Storage_none", + "group_by": "none", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Screwdriver", + "leaf": false + }, + { + "text": "Storage by Decanal Unit", + "id": "group_by_Storage_nsfdirectorate", + "group_by": "nsfdirectorate", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Decanal Unit", + "leaf": false + }, + { + "text": "Storage by Department", + "id": "group_by_Storage_parentscience", + "group_by": "parentscience", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Department", + "leaf": false + }, + { + "text": "Storage by Mountpoint", + "id": "group_by_Storage_mountpoint", + "group_by": "mountpoint", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Mountpoint", + "leaf": false + }, + { + "text": "Storage by PI", + "id": "group_by_Storage_pi", + "group_by": "pi", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI", + "leaf": false + }, + { + "text": "Storage by PI Group", + "id": "group_by_Storage_fieldofscience", + "group_by": "fieldofscience", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI Group", + "leaf": false + }, + { + "text": "Storage by Resource", + "id": "group_by_Storage_resource", + "group_by": "resource", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource", + "leaf": false + }, + { + "text": "Storage by Resource Type", + "id": "group_by_Storage_resource_type", + "group_by": "resource_type", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource Type", + "leaf": false + }, + { + "text": "Storage by System Username", + "id": "group_by_Storage_username", + "group_by": "username", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "System Username", + "leaf": false + }, + { + "text": "Storage by User", + "id": "group_by_Storage_person", + "group_by": "person", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "User", + "leaf": false + }, + { + "text": "", + "id": "-111", + "node_type": "separator", + "iconCls": "blank", + "leaf": true, + "disabled": true + }, + { + "text": "Cloud Summary", + "id": "group_by_Cloud_none", + "group_by": "none", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Screwdriver", + "leaf": false + }, + { + "text": "Cloud by Instance Type", + "id": "group_by_Cloud_configuration", + "group_by": "configuration", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Instance Type", + "leaf": false + }, + { + "text": "Cloud by Project", + "id": "group_by_Cloud_project", + "group_by": "project", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Project", + "leaf": false + }, + { + "text": "Cloud by Resource", + "id": "group_by_Cloud_resource", + "group_by": "resource", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource", + "leaf": false + }, + { + "text": "Cloud by Submission Venue", + "id": "group_by_Cloud_submission_venue", + "group_by": "submission_venue", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Submission Venue", + "leaf": false + }, + { + "text": "Cloud by System Username", + "id": "group_by_Cloud_username", + "group_by": "username", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "System Username", + "leaf": false + }, + { + "text": "Cloud by User", + "id": "group_by_Cloud_person", + "group_by": "person", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "User", + "leaf": false + }, + { + "text": "Cloud by VM Size: Cores", + "id": "group_by_Cloud_vm_size", + "group_by": "vm_size", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "VM Size: Cores", + "leaf": false + }, + { + "text": "Cloud by VM Size: Memory", + "id": "group_by_Cloud_vm_size_memory", + "group_by": "vm_size_memory", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "VM Size: Memory", + "leaf": false + }, + { + "text": "", + "id": "-111", + "node_type": "separator", + "iconCls": "blank", + "leaf": true, + "disabled": true + } +] diff --git a/tests/artifacts/xdmod/user_interface/output/pi-get_menus.json b/tests/artifacts/xdmod/user_interface/output/pi-get_menus.json new file mode 100644 index 0000000000..40ffab3ab5 --- /dev/null +++ b/tests/artifacts/xdmod/user_interface/output/pi-get_menus.json @@ -0,0 +1,488 @@ +[ + { + "text": "Jobs Summary", + "id": "group_by_Jobs_none", + "group_by": "none", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Screwdriver", + "leaf": false + }, + { + "text": "Jobs by Decanal Unit", + "id": "group_by_Jobs_nsfdirectorate", + "group_by": "nsfdirectorate", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Decanal Unit", + "leaf": false + }, + { + "text": "Jobs by Department", + "id": "group_by_Jobs_parentscience", + "group_by": "parentscience", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Department", + "leaf": false + }, + { + "text": "Jobs by Job Size", + "id": "group_by_Jobs_jobsize", + "group_by": "jobsize", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Job Size", + "leaf": false + }, + { + "text": "Jobs by Job Wait Time", + "id": "group_by_Jobs_jobwaittime", + "group_by": "jobwaittime", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Job Wait Time", + "leaf": false + }, + { + "text": "Jobs by Job Wall Time", + "id": "group_by_Jobs_jobwalltime", + "group_by": "jobwalltime", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Job Wall Time", + "leaf": false + }, + { + "text": "Jobs by Node Count", + "id": "group_by_Jobs_nodecount", + "group_by": "nodecount", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Node Count", + "leaf": false + }, + { + "text": "Jobs by PI", + "id": "group_by_Jobs_pi", + "group_by": "pi", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI", + "leaf": false + }, + { + "text": "Jobs by PI Group", + "id": "group_by_Jobs_fieldofscience", + "group_by": "fieldofscience", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI Group", + "leaf": false + }, + { + "text": "Jobs by Queue", + "id": "group_by_Jobs_queue", + "group_by": "queue", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Queue", + "leaf": false + }, + { + "text": "Jobs by Resource", + "id": "group_by_Jobs_resource", + "group_by": "resource", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource", + "leaf": false + }, + { + "text": "Jobs by Resource Type", + "id": "group_by_Jobs_resource_type", + "group_by": "resource_type", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource Type", + "leaf": false + }, + { + "text": "Jobs by System Username", + "id": "group_by_Jobs_username", + "group_by": "username", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "System Username", + "leaf": false + }, + { + "text": "Jobs by User", + "id": "group_by_Jobs_person", + "group_by": "person", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "User", + "leaf": false + }, + { + "text": "", + "id": "-111", + "node_type": "separator", + "iconCls": "blank", + "leaf": true, + "disabled": true + }, + { + "text": "Storage Summary", + "id": "group_by_Storage_none", + "group_by": "none", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Screwdriver", + "leaf": false + }, + { + "text": "Storage by Decanal Unit", + "id": "group_by_Storage_nsfdirectorate", + "group_by": "nsfdirectorate", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Decanal Unit", + "leaf": false + }, + { + "text": "Storage by Department", + "id": "group_by_Storage_parentscience", + "group_by": "parentscience", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Department", + "leaf": false + }, + { + "text": "Storage by Mountpoint", + "id": "group_by_Storage_mountpoint", + "group_by": "mountpoint", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Mountpoint", + "leaf": false + }, + { + "text": "Storage by PI", + "id": "group_by_Storage_pi", + "group_by": "pi", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI", + "leaf": false + }, + { + "text": "Storage by PI Group", + "id": "group_by_Storage_fieldofscience", + "group_by": "fieldofscience", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI Group", + "leaf": false + }, + { + "text": "Storage by Resource", + "id": "group_by_Storage_resource", + "group_by": "resource", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource", + "leaf": false + }, + { + "text": "Storage by Resource Type", + "id": "group_by_Storage_resource_type", + "group_by": "resource_type", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource Type", + "leaf": false + }, + { + "text": "Storage by System Username", + "id": "group_by_Storage_username", + "group_by": "username", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "System Username", + "leaf": false + }, + { + "text": "Storage by User", + "id": "group_by_Storage_person", + "group_by": "person", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "User", + "leaf": false + }, + { + "text": "", + "id": "-111", + "node_type": "separator", + "iconCls": "blank", + "leaf": true, + "disabled": true + }, + { + "text": "Cloud Summary", + "id": "group_by_Cloud_none", + "group_by": "none", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Screwdriver", + "leaf": false + }, + { + "text": "Cloud by Instance Type", + "id": "group_by_Cloud_configuration", + "group_by": "configuration", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Instance Type", + "leaf": false + }, + { + "text": "Cloud by Project", + "id": "group_by_Cloud_project", + "group_by": "project", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Project", + "leaf": false + }, + { + "text": "Cloud by Resource", + "id": "group_by_Cloud_resource", + "group_by": "resource", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource", + "leaf": false + }, + { + "text": "Cloud by Submission Venue", + "id": "group_by_Cloud_submission_venue", + "group_by": "submission_venue", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Submission Venue", + "leaf": false + }, + { + "text": "Cloud by System Username", + "id": "group_by_Cloud_username", + "group_by": "username", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "System Username", + "leaf": false + }, + { + "text": "Cloud by User", + "id": "group_by_Cloud_person", + "group_by": "person", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "User", + "leaf": false + }, + { + "text": "Cloud by VM Size: Cores", + "id": "group_by_Cloud_vm_size", + "group_by": "vm_size", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "VM Size: Cores", + "leaf": false + }, + { + "text": "Cloud by VM Size: Memory", + "id": "group_by_Cloud_vm_size_memory", + "group_by": "vm_size_memory", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "VM Size: Memory", + "leaf": false + }, + { + "text": "", + "id": "-111", + "node_type": "separator", + "iconCls": "blank", + "leaf": true, + "disabled": true + } +] diff --git a/tests/artifacts/xdmod/user_interface/output/pub-get_menus.json b/tests/artifacts/xdmod/user_interface/output/pub-get_menus.json new file mode 100644 index 0000000000..40ffab3ab5 --- /dev/null +++ b/tests/artifacts/xdmod/user_interface/output/pub-get_menus.json @@ -0,0 +1,488 @@ +[ + { + "text": "Jobs Summary", + "id": "group_by_Jobs_none", + "group_by": "none", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Screwdriver", + "leaf": false + }, + { + "text": "Jobs by Decanal Unit", + "id": "group_by_Jobs_nsfdirectorate", + "group_by": "nsfdirectorate", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Decanal Unit", + "leaf": false + }, + { + "text": "Jobs by Department", + "id": "group_by_Jobs_parentscience", + "group_by": "parentscience", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Department", + "leaf": false + }, + { + "text": "Jobs by Job Size", + "id": "group_by_Jobs_jobsize", + "group_by": "jobsize", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Job Size", + "leaf": false + }, + { + "text": "Jobs by Job Wait Time", + "id": "group_by_Jobs_jobwaittime", + "group_by": "jobwaittime", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Job Wait Time", + "leaf": false + }, + { + "text": "Jobs by Job Wall Time", + "id": "group_by_Jobs_jobwalltime", + "group_by": "jobwalltime", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Job Wall Time", + "leaf": false + }, + { + "text": "Jobs by Node Count", + "id": "group_by_Jobs_nodecount", + "group_by": "nodecount", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Node Count", + "leaf": false + }, + { + "text": "Jobs by PI", + "id": "group_by_Jobs_pi", + "group_by": "pi", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI", + "leaf": false + }, + { + "text": "Jobs by PI Group", + "id": "group_by_Jobs_fieldofscience", + "group_by": "fieldofscience", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI Group", + "leaf": false + }, + { + "text": "Jobs by Queue", + "id": "group_by_Jobs_queue", + "group_by": "queue", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Queue", + "leaf": false + }, + { + "text": "Jobs by Resource", + "id": "group_by_Jobs_resource", + "group_by": "resource", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource", + "leaf": false + }, + { + "text": "Jobs by Resource Type", + "id": "group_by_Jobs_resource_type", + "group_by": "resource_type", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource Type", + "leaf": false + }, + { + "text": "Jobs by System Username", + "id": "group_by_Jobs_username", + "group_by": "username", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "System Username", + "leaf": false + }, + { + "text": "Jobs by User", + "id": "group_by_Jobs_person", + "group_by": "person", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "User", + "leaf": false + }, + { + "text": "", + "id": "-111", + "node_type": "separator", + "iconCls": "blank", + "leaf": true, + "disabled": true + }, + { + "text": "Storage Summary", + "id": "group_by_Storage_none", + "group_by": "none", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Screwdriver", + "leaf": false + }, + { + "text": "Storage by Decanal Unit", + "id": "group_by_Storage_nsfdirectorate", + "group_by": "nsfdirectorate", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Decanal Unit", + "leaf": false + }, + { + "text": "Storage by Department", + "id": "group_by_Storage_parentscience", + "group_by": "parentscience", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Department", + "leaf": false + }, + { + "text": "Storage by Mountpoint", + "id": "group_by_Storage_mountpoint", + "group_by": "mountpoint", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Mountpoint", + "leaf": false + }, + { + "text": "Storage by PI", + "id": "group_by_Storage_pi", + "group_by": "pi", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI", + "leaf": false + }, + { + "text": "Storage by PI Group", + "id": "group_by_Storage_fieldofscience", + "group_by": "fieldofscience", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI Group", + "leaf": false + }, + { + "text": "Storage by Resource", + "id": "group_by_Storage_resource", + "group_by": "resource", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource", + "leaf": false + }, + { + "text": "Storage by Resource Type", + "id": "group_by_Storage_resource_type", + "group_by": "resource_type", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource Type", + "leaf": false + }, + { + "text": "Storage by System Username", + "id": "group_by_Storage_username", + "group_by": "username", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "System Username", + "leaf": false + }, + { + "text": "Storage by User", + "id": "group_by_Storage_person", + "group_by": "person", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "User", + "leaf": false + }, + { + "text": "", + "id": "-111", + "node_type": "separator", + "iconCls": "blank", + "leaf": true, + "disabled": true + }, + { + "text": "Cloud Summary", + "id": "group_by_Cloud_none", + "group_by": "none", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Screwdriver", + "leaf": false + }, + { + "text": "Cloud by Instance Type", + "id": "group_by_Cloud_configuration", + "group_by": "configuration", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Instance Type", + "leaf": false + }, + { + "text": "Cloud by Project", + "id": "group_by_Cloud_project", + "group_by": "project", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Project", + "leaf": false + }, + { + "text": "Cloud by Resource", + "id": "group_by_Cloud_resource", + "group_by": "resource", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource", + "leaf": false + }, + { + "text": "Cloud by Submission Venue", + "id": "group_by_Cloud_submission_venue", + "group_by": "submission_venue", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Submission Venue", + "leaf": false + }, + { + "text": "Cloud by System Username", + "id": "group_by_Cloud_username", + "group_by": "username", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "System Username", + "leaf": false + }, + { + "text": "Cloud by User", + "id": "group_by_Cloud_person", + "group_by": "person", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "User", + "leaf": false + }, + { + "text": "Cloud by VM Size: Cores", + "id": "group_by_Cloud_vm_size", + "group_by": "vm_size", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "VM Size: Cores", + "leaf": false + }, + { + "text": "Cloud by VM Size: Memory", + "id": "group_by_Cloud_vm_size_memory", + "group_by": "vm_size_memory", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "VM Size: Memory", + "leaf": false + }, + { + "text": "", + "id": "-111", + "node_type": "separator", + "iconCls": "blank", + "leaf": true, + "disabled": true + } +] diff --git a/tests/artifacts/xdmod/user_interface/output/usr-get_menus.json b/tests/artifacts/xdmod/user_interface/output/usr-get_menus.json new file mode 100644 index 0000000000..40ffab3ab5 --- /dev/null +++ b/tests/artifacts/xdmod/user_interface/output/usr-get_menus.json @@ -0,0 +1,488 @@ +[ + { + "text": "Jobs Summary", + "id": "group_by_Jobs_none", + "group_by": "none", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Screwdriver", + "leaf": false + }, + { + "text": "Jobs by Decanal Unit", + "id": "group_by_Jobs_nsfdirectorate", + "group_by": "nsfdirectorate", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Decanal Unit", + "leaf": false + }, + { + "text": "Jobs by Department", + "id": "group_by_Jobs_parentscience", + "group_by": "parentscience", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Department", + "leaf": false + }, + { + "text": "Jobs by Job Size", + "id": "group_by_Jobs_jobsize", + "group_by": "jobsize", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Job Size", + "leaf": false + }, + { + "text": "Jobs by Job Wait Time", + "id": "group_by_Jobs_jobwaittime", + "group_by": "jobwaittime", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Job Wait Time", + "leaf": false + }, + { + "text": "Jobs by Job Wall Time", + "id": "group_by_Jobs_jobwalltime", + "group_by": "jobwalltime", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Job Wall Time", + "leaf": false + }, + { + "text": "Jobs by Node Count", + "id": "group_by_Jobs_nodecount", + "group_by": "nodecount", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Node Count", + "leaf": false + }, + { + "text": "Jobs by PI", + "id": "group_by_Jobs_pi", + "group_by": "pi", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI", + "leaf": false + }, + { + "text": "Jobs by PI Group", + "id": "group_by_Jobs_fieldofscience", + "group_by": "fieldofscience", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI Group", + "leaf": false + }, + { + "text": "Jobs by Queue", + "id": "group_by_Jobs_queue", + "group_by": "queue", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Queue", + "leaf": false + }, + { + "text": "Jobs by Resource", + "id": "group_by_Jobs_resource", + "group_by": "resource", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource", + "leaf": false + }, + { + "text": "Jobs by Resource Type", + "id": "group_by_Jobs_resource_type", + "group_by": "resource_type", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource Type", + "leaf": false + }, + { + "text": "Jobs by System Username", + "id": "group_by_Jobs_username", + "group_by": "username", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "System Username", + "leaf": false + }, + { + "text": "Jobs by User", + "id": "group_by_Jobs_person", + "group_by": "person", + "query_group": "tg_usage", + "category": "Jobs", + "realm": "Jobs", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "User", + "leaf": false + }, + { + "text": "", + "id": "-111", + "node_type": "separator", + "iconCls": "blank", + "leaf": true, + "disabled": true + }, + { + "text": "Storage Summary", + "id": "group_by_Storage_none", + "group_by": "none", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Screwdriver", + "leaf": false + }, + { + "text": "Storage by Decanal Unit", + "id": "group_by_Storage_nsfdirectorate", + "group_by": "nsfdirectorate", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"pie\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"n\",\"show_aggregate_labels\":\"y\",\"show_error_labels\":\"n\",\"enable_errors\":\"n\",\"enable_trend_line\":\"n\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Decanal Unit", + "leaf": false + }, + { + "text": "Storage by Department", + "id": "group_by_Storage_parentscience", + "group_by": "parentscience", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Department", + "leaf": false + }, + { + "text": "Storage by Mountpoint", + "id": "group_by_Storage_mountpoint", + "group_by": "mountpoint", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Mountpoint", + "leaf": false + }, + { + "text": "Storage by PI", + "id": "group_by_Storage_pi", + "group_by": "pi", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI", + "leaf": false + }, + { + "text": "Storage by PI Group", + "id": "group_by_Storage_fieldofscience", + "group_by": "fieldofscience", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "PI Group", + "leaf": false + }, + { + "text": "Storage by Resource", + "id": "group_by_Storage_resource", + "group_by": "resource", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource", + "leaf": false + }, + { + "text": "Storage by Resource Type", + "id": "group_by_Storage_resource_type", + "group_by": "resource_type", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource Type", + "leaf": false + }, + { + "text": "Storage by System Username", + "id": "group_by_Storage_username", + "group_by": "username", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "System Username", + "leaf": false + }, + { + "text": "Storage by User", + "id": "group_by_Storage_person", + "group_by": "person", + "query_group": "tg_usage", + "category": "Storage", + "realm": "Storage", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "User", + "leaf": false + }, + { + "text": "", + "id": "-111", + "node_type": "separator", + "iconCls": "blank", + "leaf": true, + "disabled": true + }, + { + "text": "Cloud Summary", + "id": "group_by_Cloud_none", + "group_by": "none", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"timeseries\",\"display_type\":\"line\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Screwdriver", + "leaf": false + }, + { + "text": "Cloud by Instance Type", + "id": "group_by_Cloud_configuration", + "group_by": "configuration", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Instance Type", + "leaf": false + }, + { + "text": "Cloud by Project", + "id": "group_by_Cloud_project", + "group_by": "project", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Project", + "leaf": false + }, + { + "text": "Cloud by Resource", + "id": "group_by_Cloud_resource", + "group_by": "resource", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Resource", + "leaf": false + }, + { + "text": "Cloud by Submission Venue", + "id": "group_by_Cloud_submission_venue", + "group_by": "submission_venue", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "Submission Venue", + "leaf": false + }, + { + "text": "Cloud by System Username", + "id": "group_by_Cloud_username", + "group_by": "username", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "System Username", + "leaf": false + }, + { + "text": "Cloud by User", + "id": "group_by_Cloud_person", + "group_by": "person", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "User", + "leaf": false + }, + { + "text": "Cloud by VM Size: Cores", + "id": "group_by_Cloud_vm_size", + "group_by": "vm_size", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "VM Size: Cores", + "leaf": false + }, + { + "text": "Cloud by VM Size: Memory", + "id": "group_by_Cloud_vm_size_memory", + "group_by": "vm_size_memory", + "query_group": "tg_usage", + "category": "Cloud", + "realm": "Cloud", + "defaultChartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "chartSettings": "{\"dataset_type\":\"aggregate\",\"display_type\":\"h_bar\",\"combine_type\":\"stack\",\"limit\":3,\"offset\":0,\"log_scale\":\"n\",\"show_legend\":\"y\",\"show_trend_line\":\"n\",\"show_error_bars\":\"n\",\"show_guide_lines\":\"y\",\"show_aggregate_labels\":\"n\",\"show_error_labels\":\"n\",\"enable_errors\":\"y\",\"enable_trend_line\":\"y\"}", + "node_type": "group_by", + "iconCls": "menu", + "description": "VM Size: Memory", + "leaf": false + }, + { + "text": "", + "id": "-111", + "node_type": "separator", + "iconCls": "blank", + "leaf": true, + "disabled": true + } +] diff --git a/tests/component/lib/AclsTest.php b/tests/component/lib/AclsTest.php index 7e35a8bdf6..10b9e67f02 100644 --- a/tests/component/lib/AclsTest.php +++ b/tests/component/lib/AclsTest.php @@ -296,4 +296,47 @@ public function provideGetQueryDescripters() $this->getTestFiles()->getFile('acls', 'get_query_descripters', 'input') ); } + + /** + * This test ensures that `Acls::getDisabledMenus` is working as expected. The data from this + * function informs the front end code on which query descriptors should be grayed out for the + * current user. Ex. query descriptors are used to populate the Usage Explorer Tree. + * + * @dataProvider provideTestAclsGetDisabledMenus + * + * @param array $options + * @throws \Exception + */ + public function testAclsGetDisabledMenus(array $options) + { + $username = $options['username']; + $realm = $options['realm']; + + $user = XDUser::getUserByUserName($username); + $actual = Acls::getDisabledMenus($user, array($realm)); + + $fileName = "get_disabled_menus-" . (str_replace(' ', '_', strtolower($username))); + $expectedFile = $this->getTestFiles()->getFile('acls', $fileName); + + if (!is_file($expectedFile)) { + file_put_contents($expectedFile, json_encode($actual, JSON_PRETTY_PRINT) . "\n"); + echo "Generated: $expectedFile\n"; + $this->assertTrue(true); + } + + $expected = JSON::loadFile($expectedFile); + + $this->assertEquals($expected, json_decode(json_encode($actual), true)); + } + + /** + * @return array|object the contents of `get_disabled_menus.json` + * @throws \Exception if unable to read / parse the test input file. + */ + public function provideTestAclsGetDisabledMenus() + { + return JSON::loadFile( + $this->getTestFiles()->getFile('acls', 'get_disabled_menus', 'input') + ); + } } diff --git a/tests/integration/lib/Controllers/UserInterfaceTest.php b/tests/integration/lib/Controllers/UserInterfaceTest.php new file mode 100644 index 0000000000..5d6fd7e369 --- /dev/null +++ b/tests/integration/lib/Controllers/UserInterfaceTest.php @@ -0,0 +1,82 @@ + "$user-get_menus", + "http_code" => 200, + "content_type" => 'application/json' + ); + + $expectedConfig = isset($options['expected']) ? $options['expected'] : $defaultExpected; + $expectedOutputFileName = $expectedConfig['output']; + $expectedHttpCode = isset($expectedConfig['http_code']) ? $expectedConfig['http_code'] : 200; + $expectedContentType = isset($expectedConfig['content_type']) ? $expectedConfig['content_type'] : 'application/json'; + + // Make sure to authenticate the user if necessary. + if ($user !== ROLE_ID_PUBLIC) { + $this->helper->authenticate($user); + } + + $data = array_merge( + array( + 'operation' => 'get_menus', + 'query_group' => 'tg_usage' + ), + $additionalData + ); + + $response = $this->helper->post("controllers/user_interface.php", null, $data); + + if ($user !== ROLE_ID_PUBLIC) { + $this->helper->logout(); + } + + $this->validateResponse($response, $expectedHttpCode, $expectedContentType); + + $actual = $response[0]; + + $expectedOutputFile = $this->getTestFiles()->getFile('user_interface', $expectedOutputFileName, 'output'); + + if (!is_file($expectedOutputFile)) { + file_put_contents($expectedOutputFile, json_encode($actual, JSON_PRETTY_PRINT) . "\n"); + echo "Generated Expected Output for testGetMenus: $expectedOutputFile\n"; + $this->assertTrue(true); + } + + $expected = json_decode(file_get_contents($expectedOutputFile), true); + + $this->assertEquals($expected, $actual); + } // public function testGetMenus(array $options) + + /** + * Provides test data to `testGetMenus`. + * + * @return array|object + * @throws \Exception + */ + public function provideTestGetMenus() + { + return JSON::loadFile( + $this->getTestFiles()->getFile('user_interface', 'get_menus', 'input') + ); + } // public function provideTestGetMenus() +} diff --git a/tests/ui/test/specs/xdmod/SSOLogin.js b/tests/ui/test/specs/xdmod/SSOLogin.js index c965155e88..0f8ce2e191 100644 --- a/tests/ui/test/specs/xdmod/SSOLogin.js +++ b/tests/ui/test/specs/xdmod/SSOLogin.js @@ -16,6 +16,11 @@ describe('Single Sign On Login', () => { expect($('#welcome_message').getText()).to.equal('Saml Jackson'); $('#main_tab_panel__about_xdmod').waitForVisible(); }); + it('Should prompt with My Profile', () => { + browser.waitForVisible('#xdmod-profile-editor button.general_btn_close'); + browser.waitAndClick('#xdmod-profile-editor button.general_btn_close'); + browser.waitForInvisible('#xdmod-profile-editor'); + }); it('Logout', () => { browser.waitForInvisible('.ext-el-mask-msg'); browser.waitAndClick('#logout_link'); diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php index db6b06902d..8819570fb1 100644 --- a/tests/unit/bootstrap.php +++ b/tests/unit/bootstrap.php @@ -10,7 +10,7 @@ function ($className) use ($dir) { DIRECTORY_SEPARATOR, array( $dir, - '../integration_tests', + '../integration', 'lib', str_replace('\\', '/', $className) . '.php' ) @@ -32,4 +32,4 @@ function ($className) use ($dir) { ); // Autoloader for XDMoD classes. -require_once __DIR__ . '/../../../../configuration/linker.php'; +require_once __DIR__ . '/../../configuration/linker.php'; diff --git a/tests/unit/lib/ETL/Configuration/ConfigurationTest.php b/tests/unit/lib/ETL/Configuration/ConfigurationTest.php index 63e70cc16a..f432a5ae85 100644 --- a/tests/unit/lib/ETL/Configuration/ConfigurationTest.php +++ b/tests/unit/lib/ETL/Configuration/ConfigurationTest.php @@ -14,8 +14,8 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase { - const TEST_ARTIFACT_INPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/configuration/input"; - const TEST_ARTIFACT_OUTPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/configuration/output"; + const TEST_ARTIFACT_INPUT_PATH = "./../artifacts/xdmod/etlv2/configuration/input"; + const TEST_ARTIFACT_OUTPUT_PATH = "./../artifacts/xdmod/etlv2/configuration/output"; protected static $logger = null; diff --git a/tests/unit/lib/ETL/Configuration/EtlConfigurationTest.php b/tests/unit/lib/ETL/Configuration/EtlConfigurationTest.php index b3e1fa857b..7cea71bf32 100644 --- a/tests/unit/lib/ETL/Configuration/EtlConfigurationTest.php +++ b/tests/unit/lib/ETL/Configuration/EtlConfigurationTest.php @@ -18,9 +18,11 @@ class EtlConfigurationTest extends \UnitTesting\BaseTest { - const TEST_ARTIFACT_INPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/configuration/input"; - const TEST_ARTIFACT_OUTPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/configuration/output"; + const TEST_ARTIFACT_INPUT_PATH = "./../artifacts/xdmod/etlv2/configuration/input"; + const TEST_ARTIFACT_OUTPUT_PATH = "./../artifacts/xdmod/etlv2/configuration/output"; + const TMPDIR = '/tmp/xdmod-etl-configuration-test'; + private static $defaultModuleName = null; private $testFiles; @@ -28,7 +30,7 @@ class EtlConfigurationTest extends \UnitTesting\BaseTest public function __construct($name = null, array $data = array(), $dataName = '') { parent::__construct($name, $data, $dataName); - $this->testFiles = new TestFiles(__DIR__ . '/../../../'); + $this->testFiles = new TestFiles(__DIR__ . '/../../../../'); } @@ -56,6 +58,7 @@ public function testConfiguration() // generated from or paths stored in the expected result will not match! @mkdir(self::TMPDIR . '/etl_8.0.0.d', 0755, true); + copy(self::TEST_ARTIFACT_INPUT_PATH . '/xdmod_etl_config_8.0.0.json', self::TMPDIR . '/xdmod_etl_config_8.0.0.json'); copy(self::TEST_ARTIFACT_INPUT_PATH . '/etl_8.0.0.d/maintenance.json', self::TMPDIR . '/etl_8.0.0.d/maintenance.json'); copy(self::TEST_ARTIFACT_INPUT_PATH . '/etl_8.0.0.d/jobs_cloud.json', self::TMPDIR . '/etl_8.0.0.d/jobs_cloud.json'); @@ -68,18 +71,18 @@ public function testConfiguration() ); $configObj->initialize(); $generated = json_decode($configObj->toJson()); + $file = self::TEST_ARTIFACT_OUTPUT_PATH . '/xdmod_etl_config_8.0.0.json'; $expected = json_decode(file_get_contents($file)); // Cleanup - unlink(self::TMPDIR . '/xdmod_etl_config_8.0.0.json'); unlink(self::TMPDIR . '/etl_8.0.0.d/maintenance.json'); unlink(self::TMPDIR . '/etl_8.0.0.d/jobs_cloud.json'); rmdir(self::TMPDIR . '/etl_8.0.0.d'); rmdir(self::TMPDIR); - $this->assertEquals($expected, $generated, $file); + $this->assertEquals($expected, $generated, sprintf("Expected: %s\nActual: %s\n", json_encode($expected), json_encode($generated))); } /** @@ -92,6 +95,7 @@ public function testConfigurationVariables() // generated from or paths stored in the expected result will not match! @mkdir(self::TMPDIR . '/etl_8.0.0.d', 0755, true); + copy( self::TEST_ARTIFACT_INPUT_PATH . '/xdmod_etl_config_with_variables_8.0.0.json', self::TMPDIR . '/xdmod_etl_config_with_variables_8.0.0.json' @@ -193,15 +197,17 @@ public function testXdmodConfiguration(array $options) $config->initialize(); - $actual = sprintf("%s\n", $config->toJson()); + $actual = sprintf("%s\n", json_encode(json_decode($config->toJson()), JSON_PRETTY_PRINT)); if (!is_file($expectedFilePath)) { @file_put_contents($expectedFilePath, $actual); echo "\nGenerated Expected Output for: $expectedFilePath\n"; } else { $expected = @file_get_contents($expectedFilePath); + $actualEncoded = json_decode($actual); + $expectedEncoded = json_decode($expected); - $this->assertEquals($expected, $actual); + $this->assertEquals($expectedEncoded, $actualEncoded); } } @@ -261,16 +267,17 @@ public function testModuleConfiguration(array $options) $expectedFileName = sprintf("%s-%s", $options['expected'], $module); $expectedFilePath = $this->testFiles->getFile('configuration', $expectedFileName); - $actual = sprintf("%s\n", json_encode($config->filterByModule($module))); + $actual = sprintf("%s\n", json_encode($config->filterByModule($module), JSON_PRETTY_PRINT)); if (!is_file($expectedFilePath)) { @file_put_contents($expectedFilePath, $actual); echo "\nGenerated Expected Output for: $expectedFilePath\n"; } else { - $expected = @file_get_contents($expectedFilePath); + $expectedDecoded = json_decode($expected); + $actualDecoded = json_decode($actual); - $this->assertEquals($expected, $actual); + $this->assertEquals($expectedDecoded, $actualDecoded); } } } diff --git a/tests/unit/lib/ETL/Configuration/IncludeTest.php b/tests/unit/lib/ETL/Configuration/IncludeTest.php index 0e4ff67890..ea53db17de 100644 --- a/tests/unit/lib/ETL/Configuration/IncludeTest.php +++ b/tests/unit/lib/ETL/Configuration/IncludeTest.php @@ -15,8 +15,9 @@ class IncludeTest extends \PHPUnit_Framework_TestCase { - const TEST_ARTIFACT_INPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/configuration/input"; - const TEST_ARTIFACT_OUTPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/configuration/output"; + + const TEST_ARTIFACT_INPUT_PATH = "./../artifacts/xdmod/etlv2/configuration/input"; + const TEST_ARTIFACT_OUTPUT_PATH = "./../artifacts/xdmod/etlv2/configuration/output"; protected static $transformer = null; protected static $config = null; diff --git a/tests/unit/lib/ETL/Configuration/Rfc6901Test.php b/tests/unit/lib/ETL/Configuration/Rfc6901Test.php index 16285fbcb7..6956fa9b6e 100644 --- a/tests/unit/lib/ETL/Configuration/Rfc6901Test.php +++ b/tests/unit/lib/ETL/Configuration/Rfc6901Test.php @@ -14,8 +14,8 @@ class Rfc6901Test extends \PHPUnit_Framework_TestCase { - const TEST_ARTIFACT_INPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/configuration/input"; - const TEST_ARTIFACT_OUTPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/configuration/output"; + const TEST_ARTIFACT_INPUT_PATH = "./../artifacts/xdmod/etlv2/configuration/input"; + const TEST_ARTIFACT_OUTPUT_PATH = "./../artifacts/xdmod/etlv2/configuration/output"; private $config = null; private $transformer = null; diff --git a/tests/unit/lib/ETL/DataEndpoint/DirectoryScannerTest.php b/tests/unit/lib/ETL/DataEndpoint/DirectoryScannerTest.php index bb76991081..0cb95ee455 100644 --- a/tests/unit/lib/ETL/DataEndpoint/DirectoryScannerTest.php +++ b/tests/unit/lib/ETL/DataEndpoint/DirectoryScannerTest.php @@ -30,8 +30,9 @@ class DirectoryScanner extends \PHPUnit_Framework_TestCase { - const TEST_ARTIFACT_INPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/dataendpoint/input"; - const TEST_ARTIFACT_OUTPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/dataendpoint/output"; + const TEST_ARTIFACT_INPUT_PATH = "./../artifacts/xdmod/etlv2/dataendpoint/input"; + const TEST_ARTIFACT_OUTPUT_PATH = "./../artifacts/xdmod/etlv2/dataendpoint/output"; + private $logger = null; public function __construct() @@ -102,7 +103,6 @@ public function testNotDirectory() * 3. Test basic scanner with no filters and default handler for all file types. This * directory includes a file that is empty (has no records). */ - public function testBasicOptions() { $config = array( @@ -135,8 +135,8 @@ public function testBasicOptions() /** * 4. Test trying to read a file filtered using the file_pattern and directory_pattern regex. + * */ - public function testPatternFilters() { // Restrict to directories containing "_scanner" and files matching "euca*.json" diff --git a/tests/unit/lib/ETL/DataEndpoint/FileTest.php b/tests/unit/lib/ETL/DataEndpoint/FileTest.php index 6efe448ca5..a1abae935c 100644 --- a/tests/unit/lib/ETL/DataEndpoint/FileTest.php +++ b/tests/unit/lib/ETL/DataEndpoint/FileTest.php @@ -17,8 +17,8 @@ class FileTest extends \PHPUnit_Framework_TestCase { - const TEST_ARTIFACT_INPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/dataendpoint/input"; - const TEST_ARTIFACT_OUTPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/dataendpoint/output"; + const TEST_ARTIFACT_INPUT_PATH = "./../artifacts/xdmod/etlv2/dataendpoint/input"; + const TEST_ARTIFACT_OUTPUT_PATH = "./../artifacts/xdmod/etlv2/dataendpoint/output"; private $logger = null; public function __construct() diff --git a/tests/unit/lib/ETL/DataEndpoint/StructuredFileTest.php b/tests/unit/lib/ETL/DataEndpoint/StructuredFileTest.php index d92e5118c2..752b4e4843 100644 --- a/tests/unit/lib/ETL/DataEndpoint/StructuredFileTest.php +++ b/tests/unit/lib/ETL/DataEndpoint/StructuredFileTest.php @@ -40,8 +40,8 @@ class StructuredFileTest extends \PHPUnit_Framework_TestCase { - const TEST_ARTIFACT_INPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/dataendpoint/input"; - const TEST_ARTIFACT_OUTPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/dataendpoint/output"; + const TEST_ARTIFACT_INPUT_PATH = "./../artifacts/xdmod/etlv2/dataendpoint/input"; + const TEST_ARTIFACT_OUTPUT_PATH = "./../artifacts/xdmod/etlv2/dataendpoint/output"; private $logger = null; public function __construct() diff --git a/tests/unit/lib/ETL/DbModel/DbModelTest.php b/tests/unit/lib/ETL/DbModel/DbModelTest.php index 5ad922cbe2..dcef1431c6 100644 --- a/tests/unit/lib/ETL/DbModel/DbModelTest.php +++ b/tests/unit/lib/ETL/DbModel/DbModelTest.php @@ -23,8 +23,9 @@ class DbModelTest extends \PHPUnit_Framework_TestCase { - const TEST_ARTIFACT_INPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/dbmodel/input"; - const TEST_ARTIFACT_OUTPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/dbmodel/output"; + const TEST_ARTIFACT_INPUT_PATH = "./../artifacts/xdmod/etlv2/dbmodel/input"; + const TEST_ARTIFACT_OUTPUT_PATH = "./../artifacts/xdmod/etlv2/dbmodel/output"; + private $logger = null; public function __construct() diff --git a/tests/unit/lib/ETL/JsonPointer/JsonPointerTest.php b/tests/unit/lib/ETL/JsonPointer/JsonPointerTest.php index 2d3c713253..815c8ec7e5 100644 --- a/tests/unit/lib/ETL/JsonPointer/JsonPointerTest.php +++ b/tests/unit/lib/ETL/JsonPointer/JsonPointerTest.php @@ -15,8 +15,9 @@ class JsonPointerTest extends \PHPUnit_Framework_TestCase { - const TEST_ARTIFACT_INPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/configuration/input"; - const TEST_ARTIFACT_OUTPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/dbmodel/output"; + const TEST_ARTIFACT_INPUT_PATH = "./../artifacts/xdmod/etlv2/configuration/input"; + const TEST_ARTIFACT_OUTPUT_PATH = "./../artifacts/xdmod/etlv2/dbmodel/output"; + private $logger = null; public function __construct() diff --git a/tests/unit/lib/ETL/SqlParser/SqlParserTest.php b/tests/unit/lib/ETL/SqlParser/SqlParserTest.php index 1bfbb44d3b..e802de096c 100644 --- a/tests/unit/lib/ETL/SqlParser/SqlParserTest.php +++ b/tests/unit/lib/ETL/SqlParser/SqlParserTest.php @@ -15,8 +15,9 @@ class SqlParserTest extends \PHPUnit_Framework_TestCase { // Re-use existing input files - const TEST_ARTIFACT_INPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/configuration/input"; - const TEST_ARTIFACT_OUTPUT_PATH = "./artifacts/xdmod-test-artifacts/xdmod/etlv2/configuration/output"; + const TEST_ARTIFACT_INPUT_PATH = "./../artifacts/xdmod/etlv2/configuration/input"; + const TEST_ARTIFACT_OUTPUT_PATH = "./../artifacts/xdmod/etlv2/configuration/output"; + const TMPDIR = '/tmp/xdmod-etl-sqlparser-test'; private static $defaultModuleName = null;