Merge remote-tracking branch 'origin/candidate-9.2.x' into candidate-…

…9.4.x Signed-off-by: Gordon Smith <GordonJSmith@gmail.com> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # version.cmake
hpcc-systems · Nov 22, 2024 · 5a7ebfa · 5a7ebfa
2 parents 822c8c9 + c61ef49
commit 5a7ebfa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/esp/src/src-react/components/Metrics.tsx b/esp/src/src-react/components/Metrics.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { CommandBar, ContextualMenuItemType, ICommandBarItemProps, IIconProps, SearchBox, Stack } from "@fluentui/react";
+import { CommandBar, ContextualMenuItemType, ICommandBarItemProps, IIconProps, SearchBox, Stack, TooltipHost } from "@fluentui/react";
 import { Label, Spinner, ToggleButton } from "@fluentui/react-components";
 import { typographyStyles } from "@fluentui/react-theme";
 import { useConst } from "@fluentui/react-hooks";
@@ -543,7 +543,9 @@ export const Metrics: React.FunctionComponent<MetricsProps> = ({
                             header={<Stack horizontal>
                                 <ToggleButton appearance="subtle" icon={matchCase ? <BranchForkFilled /> : <BranchForkHintRegular />} title={nlsHPCC.IncludePendingItems} checked={includePendingItems} onClick={() => { setIncludePendingItems(!includePendingItems); }} />
                                 <Stack.Item grow>
-                                    <SearchBox value={scopeFilter} onChange={onChangeScopeFilter} iconProps={filterIcon} placeholder={nlsHPCC.Filter} />
+                                    <TooltipHost content={nlsHPCC.FilterMetricsTooltip}>
+                                        <SearchBox value={scopeFilter} onChange={onChangeScopeFilter} iconProps={filterIcon} placeholder={nlsHPCC.Filter} />
+                                    </TooltipHost>
                                 </Stack.Item>
                                 <ToggleButton appearance="subtle" icon={matchCase ? <TextCaseTitleFilled /> : <TextCaseTitleRegular />} title={nlsHPCC.MatchCase} checked={matchCase} onClick={() => { setMatchCase(!matchCase); }} />
                             </Stack>}

diff --git a/esp/src/src/ESPLog.ts b/esp/src/src/ESPLog.ts
@@ -47,14 +47,14 @@ export function hasLogAccess(): Promise<boolean> {
     return GetLogAccessInfo().then(response => {
         if (isExceptionResponse(response)) {
             const err = response.Exceptions.Exception[0].Message;
-            logger.error(err);
+            logger.info(err);
             return false;
         } else {
             response = response as WsLogaccess.GetLogAccessInfoResponse;
             return response?.RemoteLogManagerConnectionString !== null || response?.RemoteLogManagerType !== null;
         }
     }).catch(e => {
-        logger.error(e);
+        logger.info(e);
         return false;
     });
 }
diff --git a/esp/src/src/nls/hpcc.ts b/esp/src/src/nls/hpcc.ts
@@ -353,6 +353,7 @@ export = {
         FileUploadStillInProgress: "File upload still in progress",
         Filter: "Filter",
         FilterDetails: "Filter Details",
+        FilterMetricsTooltip: "This will filter based upon the \"Scope\" column by default. To filter on any other column, use the column name as a prefix to your search, eg: \"Filename:spill\"",
         FilterSet: "Filter Set",
         Find: "Find",
         Finished: "Finished",