benchmark-runner 1.0.822__py3-none-any.whl → 1.0.823__py3-none-any.whl

benchmark_runner/common/grafana/update_grafana_latest_value_mappings.py

@@ -26,6 +26,30 @@ class UpdateGrafanaLatestValueMappings:
         self.main_libsonnet_path = main_libsonnet_path
         self.value_mappings = self.get_value_mappings()
 
+    @staticmethod
+    def _normalize_version_for_grafana(version: str) -> str:
+        """
+        Normalizes a version string for Grafana, then strips all non-digit characters.
+
+        Examples:
+            '4.14.0-ec.2' -> '414002'
+            '4.15.0-rc.3' -> '415013'
+            '4.15.5' -> '4155'
+
+        Returns:
+            A normalized numeric string, replacing '-ec.' with '0' and '-rc.' with '1' if present;
+            otherwise returns the version string with all non-digit characters removed.
+        """
+        qualifiers = {'-ec.': '0', '-rc.': '1'}
+        for qualifier, replacement in qualifiers.items():
+            if qualifier in version:
+                replaced = version.replace(qualifier, replacement)
+                digits_only = ''.join(c for c in replaced if c.isdigit())
+                return digits_only
+
+        # No qualifier found; return only digits from the original version
+        return ''.join(c for c in version if c.isdigit())
+
     def get_last_elasticsearch_versions(self, last_es_fetch_days=LAST_ES_FETCH_DAYS):
         """
         This method fetches new versions from ElasticSearch
@@ -42,10 +66,11 @@ class UpdateGrafanaLatestValueMappings:
         display_versions = ['ocp_version', 'cnv_version', 'kata_version', 'kata_rpm_version', 'odf_version']
         for id in ids:
             data = self.elasticsearch.get_elasticsearch_index_by_id(index='ci-status', id=id)
-            for version, value in data['_source'].items():
-                if version in display_versions and value not in new_versions.values() and len(value) < self.MAX_VERSION_LEN:
-                    # Display only numbers in the Grafana panel, removing characters
-                    new_versions[value.translate(str.maketrans('', '', '.-rcef'))] = value
+            for resource, version in data['_source'].items():
+                if resource in display_versions and version not in new_versions.values() and len(version) < self.MAX_VERSION_LEN:
+                    # Normalize version for Grafana panel if it contains non-digit characters
+                    normalized = self._normalize_version_for_grafana(version)
+                    new_versions[normalized] = version
 
         return new_versions
 
@@ -88,9 +113,11 @@ class UpdateGrafanaLatestValueMappings:
         max_index, max_key = sorted_mapping[-1][1]['index'], sorted_mapping[-1][0]
 
         num = 1
-        for key, value in last_versions.items():
-            if not self.value_mappings.get(key):
-                self.value_mappings[key] = {"index": int(max_index) + num, "text": value}
+        for version_key, version in last_versions.items():
+            if not self.value_mappings.get(version_key) or self.value_mappings[version_key]['text'] != version:
+                # Normalize version for Grafana panel
+                normalized = self._normalize_version_for_grafana(version)
+                self.value_mappings[normalized] = {"index": int(max_index) + num, "text": version}
                 num += 1
 
     def update_main_libsonnet(self):

{benchmark_runner-1.0.822.dist-info → benchmark_runner-1.0.823.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: benchmark-runner
-Version: 1.0.822
+Version: 1.0.823
 Summary: Benchmark Runner Tool
 Home-page: https://github.com/redhat-performance/benchmark-runner
 Author: Red Hat

{benchmark_runner-1.0.822.dist-info → benchmark_runner-1.0.823.dist-info}/RECORD

@@ -41,7 +41,7 @@ benchmark_runner/common/google_drive/google_drive_exceptions.py,sha256=7he1sGD-v
 benchmark_runner/common/google_drive/google_drive_operations.py,sha256=dGf2_aDSU1XoXSEHk5kAJK7ZWWwbd_QATmXV0nulTms,17553
 benchmark_runner/common/grafana/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchmark_runner/common/grafana/grafana_operations.py,sha256=Emt-p44OSe_XgVp6c94EVcDEaniyYtUDQMWCGIP0GR8,4877
-benchmark_runner/common/grafana/update_grafana_latest_value_mappings.py,sha256=aBKXx1spB8O2kjVsOl5heLl5lKcU07Hx8oHJLasJpSQ,5523
+benchmark_runner/common/grafana/update_grafana_latest_value_mappings.py,sha256=xZQpI14J70lTDb7YiZMtlPghXal9_VQ3bv46fO2y7X8,6767
 benchmark_runner/common/logger/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchmark_runner/common/logger/init_logger.py,sha256=ERa-gNqrl2pZybj7v3csvmao7Mv1CIeFhpNKx68DSTc,968
 benchmark_runner/common/logger/logger_exceptions.py,sha256=rivdlRm_jIsKQ53rP_-HX8emdtOmQNO4JuIkg8fnBoc,454
@@ -174,8 +174,8 @@ benchmark_runner/workloads/windows_vm.py,sha256=qFVD3qBFMnVpYXnrpam-7H5-0Yzvx6qt
 benchmark_runner/workloads/workloads.py,sha256=F9fnk4h715tq7ANSCbDH0jktB8fpr_u3YG61Kdi5_os,1422
 benchmark_runner/workloads/workloads_exceptions.py,sha256=u7VII95iPRF_YhfpGH1U1RmgiIYESMOtbSF1dz7_ToE,1858
 benchmark_runner/workloads/workloads_operations.py,sha256=DUwvmswAgOXEbrVrV8OTRhrX4K18jnCwedHo9-W5z2s,27068
-benchmark_runner-1.0.822.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.822.dist-info/METADATA,sha256=qJ8JVOPWi3bQCeIu3lqiRxrvgDmxi8oJ2eWZTNXKoxA,11520
-benchmark_runner-1.0.822.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-benchmark_runner-1.0.822.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.822.dist-info/RECORD,,
+benchmark_runner-1.0.823.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.823.dist-info/METADATA,sha256=CbkQZrvPrz1-00Na6ELQ3D8HszLHJAsjKKlzNX4hdbM,11520
+benchmark_runner-1.0.823.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+benchmark_runner-1.0.823.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.823.dist-info/RECORD,,