Pull request update/250428

56bf836 OSN-823. Category for LB + skip metrics for Basic LB
6770e09 OSN-765: Compact S3 Duplicate Buckets List
ede9c79 OSN-804. Fixed division by zero in rightsizing_instances
8a0c750 OSN-821. Added action for testing run_observer

Author: stanfra

.github/workflows/test_run_observer.yaml

@@ -0,0 +1,30 @@
+name: Build run_observer test image and run tests on it
+run-name: Build run_observer test image and run tests on it - started by ${{ github.actor }}
+permissions: read-all
+on:
+  pull_request:
+    types: [opened, synchronize]
+    paths:
+    - 'docker_images/run_observer/**'
+  workflow_dispatch:
+
+
+jobs:
+  build_image:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+      - name: Login to Docker Hub (optional)
+        env:
+          username: ${{ secrets.EXT_DOCKER_LOGIN }}
+          password: ${{ secrets.EXT_DOCKER_TOKEN }}
+        if: ${{ env.username != '' && env.password != ''}}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ env.username }}
+          password: ${{ env.password }}
+      - name: Build image
+        run: bash -x build.sh run_observer build
+      - name: Build test image and run tests
+        run: bash -x docker_images/run_test.sh run_observer

bumiworker/bumiworker/modules/rightsizing_base.py

@@ -476,7 +476,10 @@ def get_base_azure_instances_info(self, cloud_resources,
                     continue
                 res_id = r['_id']['resource_id']
                 meter_id = r['_id']['meter_id']
-                day_cost = r['cost'] * HOURS_IN_DAY / r['usage_quantity']
+                usage = r['usage_quantity']
+                if not usage:
+                    continue
+                day_cost = r['cost'] * HOURS_IN_DAY / usage
                 data = {
                     'day_cost': day_cost,
                     'total_cost': r['cost'],

docker_images/run_observer/run_observer.py

@@ -108,8 +108,8 @@ def observe(self):
             if runs_to_update:
                 self.mongo_client.arcee.run.bulk_write(runs_to_update)
                 runs_to_update.clear()
-            LOG.info(f"Finished processing for organization {organization_id},"
-                     f"updated {run_count} runs")
+            LOG.info("Finished processing for organization %s,"
+                     "updated %s runs", organization_id, run_count)
 
 
 if __name__ == "__main__":

metroculus/metroculus_worker/processor.py

@@ -206,11 +206,16 @@ def start(self):
                 'Cloud %s is not supported' % cloud_type)
 
         adapter = self._get_cloud_adapter(cloud_account)
+        additional_params = {}
+        if cloud_type == 'azure_cnr':
+            # metrics are not supported for Basic LB
+            additional_params['meta.category'] = {'$ne': 'Basic'}
         cloud_account_resources = list(
             self.mongo_client.restapi.resources.find({
                 'cloud_account_id': cloud_account['id'],
                 'active': True,
-                'resource_type': {'$in': SUPPORTED_RESOURCE_TYPES}
+                'resource_type': {'$in': SUPPORTED_RESOURCE_TYPES},
+                **additional_params
             }, ['_id', 'last_seen', 'cloud_resource_id',
                 'region', 'resource_type', 'name', 'k8s_namespace',
                 'meta.source_cluster_id', 'meta.ram']

ngui/ui/src/components/DashedTypography/DashedTypography.styles.ts

@@ -3,8 +3,16 @@ import { makeStyles } from "tss-react/mui";
 const useStyles = makeStyles()(() => ({
   dashed: {
     display: "inline",
-    borderBottom: "1px dashed",
-    width: "fit-content"
+    position: "relative",
+    width: "fit-content",
+    "&:after": {
+      content: '""',
+      position: "absolute",
+      bottom: -1,
+      left: 0,
+      width: "100%",
+      borderBottom: "1px dashed"
+    }
   },
   cursorPointer: {
     "&:hover": {

ngui/ui/src/components/ExpandableList/ExpandableList.tsx

@@ -10,12 +10,7 @@ type ExpandableListProps<T> = {
   stopPropagationOnShowMore?: boolean;
 };
 
-const ExpandableList = <T,>({
-  items,
-  render,
-  maxRows = undefined,
-  stopPropagationOnShowMore = false
-}: ExpandableListProps<T>) => {
+const Expander = <T,>({ items, render, maxRows = undefined, stopPropagationOnShowMore = false }: ExpandableListProps<T>) => {
   const [isExpanded, setIsExpanded] = useToggle(false);
 
   const content = useMemo(() => {
@@ -24,27 +19,34 @@ const ExpandableList = <T,>({
     return itemsToShow.map((item, i, array) => render(item, i, array));
   }, [isExpanded, items, maxRows, render]);
 
-  const expander = () => (
-    <DashedTypography
-      onClick={(event) => {
-        if (stopPropagationOnShowMore) {
-          event.stopPropagation();
-        }
-        setIsExpanded();
-      }}
-    >
-      <FormattedMessage id={isExpanded ? "showLess" : "showMore"} />
-    </DashedTypography>
-  );
-
-  const showExpander = isExpanded || content.length !== items.length;
-
   return (
     <>
       {content}
-      {showExpander && expander()}
+      <DashedTypography
+        onClick={(event) => {
+          if (stopPropagationOnShowMore) {
+            event.stopPropagation();
+          }
+          setIsExpanded();
+        }}
+      >
+        <FormattedMessage id={isExpanded ? "showLess" : "showMore"} />
+      </DashedTypography>
     </>
   );
 };
 
+const ExpandableList = <T,>({
+  items,
+  render,
+  maxRows = undefined,
+  stopPropagationOnShowMore = false
+}: ExpandableListProps<T>) => {
+  if (maxRows && items.length > maxRows) {
+    return <Expander items={items} render={render} maxRows={maxRows} stopPropagationOnShowMore={stopPropagationOnShowMore} />;
+  }
+
+  return items.map((item, i, array) => render(item, i, array));
+};
+
 export default ExpandableList;

ngui/ui/src/components/S3DuplicateFinderCheck/S3DuplicateFinderCheck.tsx

@@ -4,8 +4,9 @@ import { FormattedMessage } from "react-intl";
 import { Link as RouterLink } from "react-router-dom";
 import ActionBar from "components/ActionBar";
 import FormattedDigitalUnit, { SI_UNITS } from "components/FormattedDigitalUnit";
-import KeyValueLabel from "components/KeyValueLabel/KeyValueLabel";
+import KeyValueLabel from "components/KeyValueLabel";
 import PageContentWrapper from "components/PageContentWrapper";
+import S3DuplicatesBucketsList from "components/S3DuplicatesBucketsList";
 import TypographyLoader from "components/TypographyLoader";
 import { RECOMMENDATIONS, S3_DUPLICATE_FINDER } from "urls";
 import { MB } from "utils/constants";
@@ -125,10 +126,7 @@ const S3DuplicateFinderCheck = ({ gemini: checkData, thresholds, isLoadingProps
               <TypographyLoader linesCount={2} />
             ) : (
               <>
-                <KeyValueLabel
-                  keyMessageId="selectedBuckets"
-                  value={filtersBuckets.map(({ name: bucketName }) => bucketName).join(", ")}
-                />
+                <S3DuplicatesBucketsList bucketNames={filtersBuckets.map(({ name: bucketName }) => bucketName)} />
                 <KeyValueLabel
                   keyMessageId="minimumObjectSize"
                   value={<FormattedDigitalUnit value={minSize / MB} baseUnit={SI_UNITS.MEGABYTE} />}

ngui/ui/src/components/S3DuplicatesBucketsList/S3DuplicatesBucketsList.tsx

@@ -0,0 +1,30 @@
+import { Box, Typography } from "@mui/material";
+import { FormattedMessage } from "react-intl";
+import ExpandableList from "components/ExpandableList";
+import HtmlSymbol from "components/HtmlSymbol";
+import { isLastItem } from "utils/arrays";
+
+type S3DuplicatesBucketsListProps = {
+  bucketNames: string[];
+};
+
+const S3DuplicatesBucketsList = ({ bucketNames }: S3DuplicatesBucketsListProps) => (
+  <Box display="flex" columnGap="4px" rowGap="2px" flexWrap="wrap" alignItems="center">
+    <Typography noWrap component="span">
+      <FormattedMessage id="selectedBuckets" />
+      &#58;
+    </Typography>
+    <ExpandableList
+      items={bucketNames}
+      render={(bucketName, index, items) => (
+        <Typography key={bucketName}>
+          <strong>{bucketName}</strong>
+          {!isLastItem(index, items.length) && <HtmlSymbol symbol="comma" />}
+        </Typography>
+      )}
+      maxRows={5}
+    />
+  </Box>
+);
+
+export default S3DuplicatesBucketsList;

ngui/ui/src/components/S3DuplicatesBucketsList/index.ts

@@ -0,0 +1,3 @@
+import S3DuplicatesBucketsList from "./S3DuplicatesBucketsList";
+
+export default S3DuplicatesBucketsList;

ngui/ui/src/components/forms/CreateS3DuplicateFinderCheckForm/FormElements/BucketsField.tsx

@@ -1,9 +1,9 @@
 import { useEffect, useMemo } from "react";
 import { FormControl, FormHelperText } from "@mui/material";
-import Typography from "@mui/material/Typography";
 import { Controller, useFormContext } from "react-hook-form";
 import { FormattedMessage, useIntl } from "react-intl";
 import CloudResourceId from "components/CloudResourceId";
+import S3DuplicatesBucketsList from "components/S3DuplicatesBucketsList";
 import Table from "components/Table";
 import TableLoader from "components/TableLoader";
 import { resourceLocation } from "utils/columns";
@@ -131,14 +131,7 @@ const BucketsField = ({ buckets, dataSources, isLoading }) => {
           ) : (
             <>
               <TableField buckets={buckets} dataSources={dataSources} value={value} onChange={onChange} errors={errors} />
-              {!isEmptyObject(selectedBuckets) && (
-                // Intentionally avoided using KeyValue label due to inconvenience
-                <Typography variant="caption">
-                  <FormattedMessage id="selectedBuckets" />
-                  &#58;&nbsp;
-                  <strong>{Object.keys(selectedBuckets).join(", ")}</strong>
-                </Typography>
-              )}
+              {!isEmptyObject(selectedBuckets) && <S3DuplicatesBucketsList bucketNames={Object.keys(selectedBuckets)} />}
               {!!errors[FIELD_NAME] && <FormHelperText error>{errors[FIELD_NAME].message}</FormHelperText>}
             </>
           )