robusta-cli 0.10.31__tar.gz → 0.10.32a0__tar.gz

{robusta_cli-0.10.31 → robusta_cli-0.10.32a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robusta-cli
-Version: 0.10.31
+Version: 0.10.32a0
 Summary: 
 Author: Natan Yellin
 Author-email: aantn@users.noreply.github.com
@@ -20,9 +20,9 @@ Requires-Dist: bitmath (>=1.3.3.1,<2.0.0.0)
 Requires-Dist: click-spinner (>=0.1.10,<0.2.0)
 Requires-Dist: colorlog (>=5.0.1,<6.0.0)
 Requires-Dist: croniter (>=1.3.15,<2.0.0)
-Requires-Dist: cryptography (>=39.0.1,<40.0.0)
+Requires-Dist: cryptography (>=42.0.5,<43.0.0)
 Requires-Dist: datadog-api-client (>=1.2.0,<2.0.0) ; extra == "all"
-Requires-Dist: docutils (>=0.17.0,<0.18.0)
+Requires-Dist: docutils (==0.19)
 Requires-Dist: dpath (>=2.0.5,<3.0.0)
 Requires-Dist: dulwich (==0.20.28) ; extra == "all"
 Requires-Dist: fpdf2 (>=2.7.1,<3.0.0)
@@ -36,6 +36,7 @@ Requires-Dist: poetry-core (==1.1.0a7) ; extra == "all"
 Requires-Dist: prometheus-client (>=0.12.0,<0.13.0)
 Requires-Dist: prometrix (==0.1.16)
 Requires-Dist: pydantic (>=1.8.1,<2.0.0)
+Requires-Dist: pydash (==8.0.0)
 Requires-Dist: pymsteams (>=0.1.16,<0.2.0)
 Requires-Dist: pytz (>=2021.3,<2022.0)
 Requires-Dist: pyyaml (>=6.0,<7.0)

{robusta_cli-0.10.31 → robusta_cli-0.10.32a0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "robusta-cli"
-version = "0.10.31"
+version = "0.10.32-alpha"
 description = ""
 authors = ["Natan Yellin <aantn@users.noreply.github.com>"]
 packages = [
@@ -48,7 +48,7 @@ prometheus-client = "^0.12.0"
 pyyaml = "^6.0"
 pytz = "^2021.3"
 poetry-core = "1.1.0a7"
-docutils="^0.17.0"
+docutils="0.19"
 sentry-sdk = { version = "^1.5.2", optional = true }
 opsgenie-sdk = "^2.1.5"
 markdown2 = "^2.4.2"
@@ -62,7 +62,7 @@ croniter = "^1.3.15"
 # and therefore requires gcc to install which we'd like to avoid
 # this is similar to the issue at https://github.com/dulwich/dulwich/issues/839
 dulwich =  { version = "0.20.28", optional = true }
-cryptography = "^39.0.1"
+cryptography = "^42.0.5"
 PyJWT = "2.4.0"
 fpdf2 = "^2.7.1"
 attrs = "^23.1.0"
@@ -70,21 +70,22 @@ prometrix = "0.1.16"
 hikaru-model-26 = "^1.1.1"
 apprise = "^1.5.0"
 rocketchat-api = "^1.30.0"
+pydash = "8.0.0"
 
 [tool.poetry.dev-dependencies]
 pre-commit = "^2.13.0"
 pytest = "^6.2.4"
 python-dotenv = "^0.18.0"
-Sphinx = "^4.3.2"
+Sphinx = "6.2.1"
 #furo = "^2021.11.12"
 sphinx-autobuild = "^2021.3.14"
 sphinx-copybutton = "^0.4.0"
-sphinx-design = "^0.0.13"
+sphinx-design = "0.5.0"
 witchhazel = "^2018.8.23"
 sphinx-autodoc-typehints = "^1.12.0"
 sphinxcontrib-images = "^0.9.4"
 jsonref = "^0.2"
-Pillow = "^10.2.0"
+Pillow = "^10.3.0"
 sphinxcontrib-mermaid = "^0.7.1"
 humanize = "^3.13.1"
 cssselect = "^1.1.0"

{robusta_cli-0.10.31 → robusta_cli-0.10.32a0}/src/robusta/_version.py

@@ -1,2 +1,2 @@
 # this is updated by .github/workflows/release.yaml
-__version__ = "0.10.31"
+__version__ = "0.10.32-alpha"

{robusta_cli-0.10.31 → robusta_cli-0.10.32a0}/src/robusta/api/__init__.py

@@ -155,9 +155,11 @@ from robusta.core.reporting import (
     MarkdownBlock,
     PrometheusBlock,
     ScanReportBlock,
+    PopeyeScanReportBlock,
+    KRRScanReportBlock,
     ScanReportRow,
     TableBlock,
-    VideoLink
+    VideoLink,
 )
 
 from robusta.core.reporting.base import EnrichmentType
@@ -318,7 +320,7 @@ from robusta.utils.parsing import load_json
 from robusta.utils.rate_limiter import RateLimiter
 from robusta.utils.silence_utils import (
     AddSilenceParams,
-    BaseSilenceParams,
+    AlertManagerParams,
     DeleteSilenceParams,
     Silence,
     SilenceOperation,

{robusta_cli-0.10.31 → robusta_cli-0.10.32a0}/src/robusta/core/discovery/discovery.py

@@ -42,6 +42,7 @@ from pydantic import BaseModel
 from robusta.core.discovery import utils
 from robusta.core.model.cluster_status import ClusterStats
 from robusta.core.model.env_vars import (
+    ARGO_ROLLOUTS,
     DISABLE_HELM_MONITORING,
     DISCOVERY_BATCH_SIZE,
     DISCOVERY_MAX_BATCHES,
@@ -53,7 +54,7 @@ from robusta.core.model.helm_release import HelmRelease
 from robusta.core.model.jobs import JobInfo
 from robusta.core.model.namespaces import NamespaceInfo
 from robusta.core.model.services import ContainerInfo, ServiceConfig, ServiceInfo, VolumeInfo
-from robusta.integrations.kubernetes.custom_models import DeploymentConfig, DictToK8sObj
+from robusta.integrations.kubernetes.custom_models import DeploymentConfig, DictToK8sObj, Rollout
 from robusta.patch.patch import create_monkey_patches
 from robusta.utils.cluster_provider_discovery import cluster_provider
 from robusta.utils.stack_tracer import StackTracer
@@ -231,6 +232,52 @@ class Discovery:
                     if not continue_ref:
                         break
 
+            # rollouts.
+            continue_ref = None
+            if ARGO_ROLLOUTS:
+                for _ in range(DISCOVERY_MAX_BATCHES):
+                    try:
+                        rollouts_res = client.CustomObjectsApi().list_cluster_custom_object(
+                            group=Rollout.group,
+                            version=Rollout.version,
+                            plural=Rollout.plural,
+                            limit=DISCOVERY_BATCH_SIZE,
+                            _continue=continue_ref,
+                        )
+                    except Exception:
+                        logging.exception(msg="Failed to list Argo Rollouts from api.")
+                        break
+
+                    for ro in rollouts_res.get("items", []):
+                        try:
+                            meta = DictToK8sObj(ro.get("metadata"), V1ObjectMeta)
+                            spec = ro.get("spec", {})
+                            template = DictToK8sObj(spec.get("template"), V1PodTemplateSpec)
+                            status = ro.get("status", {})
+
+                            active_services.extend(
+                                [
+                                    Discovery.__create_service_info(
+                                        meta=meta,
+                                        kind=Rollout.kind,
+                                        containers=template.spec.containers if template else [],
+                                        volumes=template.spec.volumes if template else [],
+                                        total_pods=status.get("replicas", 1),
+                                        ready_pods=status.get("readyReplicas", 0),
+                                        is_helm_release=is_release_managed_by_helm(
+                                            annotations=meta.annotations, labels=meta.labels
+                                        ),
+                                    )
+                                ]
+                            )
+                        except Exception:
+                            logging.exception(msg=f"Failed to parse Rollout/n {ro}")
+                            continue
+
+                    continue_ref = rollouts_res.get("metadata", {}).get("continue")
+                    if not continue_ref:
+                        break
+
             # discover deployments
             # using k8s api `continue` to load in batches
             continue_ref = None

{robusta_cli-0.10.31 → robusta_cli-0.10.32a0}/src/robusta/core/discovery/resource_names.py

@@ -3,7 +3,7 @@ from typing import Callable, List, Optional
 from kubernetes import client
 from pydantic import BaseModel
 
-from robusta.integrations.kubernetes.custom_models import DeploymentConfig
+from robusta.integrations.kubernetes.custom_models import DeploymentConfig, Rollout
 from robusta.utils.error_codes import ActionException, ErrorCodes
 
 
@@ -59,6 +59,10 @@ LISTERS = {  # TODO add ingress and cronjobs once upgrading the k8s client versi
         list_all=DeploymentConfig.list_for_all_namespaces,
         list_namespaced=DeploymentConfig.list_namespaced,
     ),
+    "rollout": ResourceLister(
+        list_all=Rollout.list_for_all_namespaces,
+        list_namespaced=Rollout.list_namespaced,
+    ),
 }
 
 

{robusta_cli-0.10.31 → robusta_cli-0.10.32a0}/src/robusta/core/model/env_vars.py

@@ -109,3 +109,7 @@ IS_OPENSHIFT = load_bool("IS_OPENSHIFT", False)
 ENABLE_GRAPH_BLOCK = load_bool("ENABLE_GRAPH_BLOCK", False)
 
 RUN_AS_SUBPROCESS = load_bool("RUN_AS_SUBPROCESS", True)
+
+ARGO_ROLLOUTS = load_bool("ARGO_ROLLOUTS", False)
+# lowered case k8s kinds in a json array string. "[\"configmap\", \"secret\"]"
+RESOURCE_YAML_BLOCK_LIST = json.loads(os.environ.get("RESOURCE_YAML_BLOCK_LIST", "[]"))

{robusta_cli-0.10.31 → robusta_cli-0.10.32a0}/src/robusta/core/model/events.py

@@ -76,7 +76,7 @@ class ExecutionBaseEvent:
 
     def create_default_finding(self) -> Finding:
         """Create finding default fields according to the event type"""
-        return Finding(title="Robusta notification", aggregation_key="Generic finding key")
+        return Finding(title="Robusta notification", aggregation_key="GenericFindingKey")
 
     def set_all_sinks(self, all_sinks: Dict[str, SinkBase]):
         self.all_sinks = all_sinks

{robusta_cli-0.10.31 → robusta_cli-0.10.32a0}/src/robusta/core/playbooks/crash_reporter.py

@@ -12,7 +12,7 @@ from robusta.integrations.kubernetes.custom_models import RegexReplacementStyle
 
 def send_crash_report(
         event: PodEvent,
-        action_name: str,
+        aggregation_key: str,
         regex_replacer_patterns: Optional[NamedRegexPattern] = None,
         regex_replacement_style: Optional[RegexReplacementStyle] = None,
 ):
@@ -29,7 +29,7 @@ def send_crash_report(
         title=f"Crashing pod {pod.metadata.name} in namespace {pod.metadata.namespace}",
         source=FindingSource.KUBERNETES_API_SERVER,
         severity=FindingSeverity.HIGH,
-        aggregation_key=action_name,
+        aggregation_key=aggregation_key,
         subject=PodFindingSubject(pod),
     )
 

{robusta_cli-0.10.31 → robusta_cli-0.10.32a0}/src/robusta/core/playbooks/internal/discovery_events.py

@@ -71,7 +71,7 @@ def create_debug_event_finding(event: Event):
         source=FindingSource.KUBERNETES_API_SERVER,
         severity=FindingSeverity.DEBUG,
         finding_type=FindingType.ISSUE,
-        aggregation_key=f"Kubernetes {event.type} Event",
+        aggregation_key=f"Kubernetes{event.type}Event",
         subject=FindingSubject(
             k8s_obj.name,
             subject_type,

{robusta_cli-0.10.31 → robusta_cli-0.10.32a0}/src/robusta/core/playbooks/playbooks_event_handler_impl.py

@@ -18,6 +18,7 @@ from robusta.core.reporting import MarkdownBlock
 from robusta.core.reporting.base import Finding
 from robusta.core.reporting.consts import SYNC_RESPONSE_SINK
 from robusta.core.sinks.robusta.dal.model_conversion import ModelConversion
+from robusta.integrations.kubernetes.base_triggers import K8sBaseTrigger
 from robusta.model.alert_relabel_config import AlertRelabel
 from robusta.model.config import Registry
 from robusta.model.playbook_action import PlaybookAction
@@ -52,6 +53,9 @@ class PlaybooksEventHandlerImpl(PlaybooksEventHandler):
                 execution_event = None
                 try:
                     execution_event = fired_trigger.build_execution_event(trigger_event, sink_findings, build_context)
+                    if isinstance(fired_trigger, K8sBaseTrigger):
+                        if not fired_trigger.check_change_filters(execution_event):
+                            continue
                     # sink_findings needs to be shared between playbooks.
                     # build_execution_event returns a different instance because it's running in a child process
                     execution_event.sink_findings = sink_findings

{robusta_cli-0.10.31 → robusta_cli-0.10.32a0}/src/robusta/core/playbooks/pod_utils/crashloop_utils.py

@@ -4,6 +4,7 @@ from hikaru.model.rel_1_26 import Pod
 
 from robusta.core.reporting import TableBlock
 from robusta.core.reporting.base import Enrichment, EnrichmentType
+from robusta.core.reporting.blocks import TableBlockFormat
 
 
 def get_crash_report_enrichments(
@@ -26,8 +27,6 @@ def get_crash_report_enrichments(
         crash_info_rows.append(["Restarts", container_status.restartCount])
 
         if container_status.state and container_status.state.terminated:
-            if container_status.state.terminated.startedAt:
-                crash_info_rows.append(["Crashing since", container_status.state.terminated.startedAt])
             crash_info_rows.append(["Status", "TERMINATED"])
             crash_info_rows.append(["Reason", container_status.state.terminated.reason])
 
@@ -47,11 +46,13 @@ def get_crash_report_enrichments(
             [[k, v] for (k, v) in crash_info_rows],
             ["label", "value"],
             table_name="*Crash Info*",
+            table_format=TableBlockFormat.vertical,
         )
         prev_container_table_block = TableBlock(
             [[k, v] for (k, v) in prev_container_rows],
             ["label", "value"],
             table_name="*Previous Container*",
+            table_format=TableBlockFormat.vertical,
         )
 
         pod_issues_enrichments.append(Enrichment(enrichment_type=EnrichmentType.crash_info,

{robusta_cli-0.10.31 → robusta_cli-0.10.32a0}/src/robusta/core/playbooks/pod_utils/imagepull_utils.py

@@ -9,6 +9,7 @@ from hikaru.model.rel_1_26 import ContainerStatus, Event, EventList, Pod, PodSta
 
 from robusta.core.reporting import BaseBlock, MarkdownBlock, TableBlock
 from robusta.core.reporting.base import EnrichmentType, Enrichment
+from robusta.core.reporting.blocks import TableBlockFormat
 
 
 class ImagePullBackoffReason(Flag):
@@ -92,6 +93,7 @@ def get_image_pull_backoff_enrichment(pod: Pod) -> Enrichment:
         image_pull_table_blocks.append(TableBlock(
             [[k, v] for (k, v) in image_issue_rows],
             ["label", "value"],
+            table_format=TableBlockFormat.vertical,
         ))
 
     image_pull_table_blocks.extend(error_blocks)
@@ -106,7 +108,7 @@ def __imagepull_backoff_reason_to_fix(reason: ImagePullBackoffReason) -> Optiona
     if reason == ImagePullBackoffReason.RepoDoesntExist:
         return "Image not found", "Make sure the image repository, image name and image tag are correct."
     if reason == ImagePullBackoffReason.NotAuthorized:
-        return "Unauthorized", 'The repo is access protected. Make sure to <a target="_blank" href="https:\/\/kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/">configure the correct image pull secrets</a>'
+        return "Unauthorized", 'The repo is access protected. Make sure to configure the correct image pull secrets: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry'
     if reason == ImagePullBackoffReason.Timeout:
         return "Timeout", 'If this does not resolved after a few minutes, make sure the image repository is responding.'
 

{robusta_cli-0.10.31 → robusta_cli-0.10.32a0}/src/robusta/core/playbooks/pod_utils/pending_pod_utils.py

@@ -9,7 +9,7 @@ from robusta.core.model.pods import pod_other_requests, pod_requests
 from robusta.core.playbooks.common import get_event_timestamp
 from robusta.core.reporting import Enrichment
 from robusta.core.reporting.base import EnrichmentType
-from robusta.core.reporting.blocks import BaseBlock, MarkdownBlock, TableBlock
+from robusta.core.reporting.blocks import BaseBlock, MarkdownBlock, TableBlock, TableBlockFormat
 
 
 def get_pending_pod_enrichment(pod: Pod) -> Enrichment:
@@ -23,6 +23,7 @@ def get_pending_pod_enrichment(pod: Pod) -> Enrichment:
     blocks = [TableBlock(
         [[k, v] for (k, v) in pending_rows],
         ["label", "value"],
+        table_format=TableBlockFormat.vertical,
     )]
 
     if all_reasons:

{robusta_cli-0.10.31 → robusta_cli-0.10.32a0}/src/robusta/core/reporting/__init__.py

@@ -1,8 +1,8 @@
 from robusta.core.reporting.base import (
     BaseBlock,
     Emojis,
-    Enrichment,
     Filterable,
+    Enrichment,
     Finding,
     FindingSeverity,
     FindingSource,
@@ -28,6 +28,8 @@ from robusta.core.reporting.blocks import (
     MarkdownBlock,
     PrometheusBlock,
     ScanReportBlock,
+    PopeyeScanReportBlock,
+    KRRScanReportBlock,
     ScanReportRow,
     TableBlock,
 )
@@ -40,8 +42,8 @@ __all__ = [
     "VideoLink",
     "FindingSource",
     "Enrichment",
-    "FindingSubjectType",
     "Filterable",
+    "FindingSubjectType",
     "FindingSubject",
     "Finding",
     "MarkdownBlock",

{robusta_cli-0.10.31 → robusta_cli-0.10.32a0}/src/robusta/core/reporting/base.py

@@ -3,6 +3,7 @@ import logging
 import re
 import urllib.parse
 import uuid
+from abc import ABC, abstractmethod
 from datetime import datetime
 from enum import Enum
 from typing import Any, Dict, List, Optional, Union
@@ -13,6 +14,7 @@ from pydantic.main import BaseModel
 from robusta.core.discovery.top_service_resolver import TopServiceResolver
 from robusta.core.model.env_vars import ROBUSTA_UI_DOMAIN
 from robusta.core.reporting.consts import FindingSource, FindingSubjectType, FindingType
+from robusta.utils.scope import BaseScopeMatcher
 
 
 class BaseBlock(BaseModel):
@@ -129,8 +131,17 @@ class Enrichment:
         return f"annotations: {self.annotations} Enrichment: {self.blocks} "
 
 
-class Filterable:
+class FilterableScopeMatcher(BaseScopeMatcher):
+    def __init__(self, data):
+        self.data = data
+
+    def get_data(self) -> Dict:
+        return self.data
+
+
+class Filterable(ABC):
     @property
+    @abstractmethod
     def attribute_map(self) -> Dict[str, Union[str, Dict[str, str]]]:
         raise NotImplementedError
 
@@ -158,11 +169,12 @@ class Filterable:
         # 1. "scope" check
         accept = True
         if scope_requirements is not None:
+            matcher = FilterableScopeMatcher(self.attribute_map)
             if scope_requirements.exclude:
-                if self.scope_inc_exc_matches(scope_requirements.exclude):
+                if matcher.scope_inc_exc_matches(scope_requirements.exclude):
                     return False
             if scope_requirements.include:
-                if self.scope_inc_exc_matches(scope_requirements.include):
+                if matcher.scope_inc_exc_matches(scope_requirements.include):
                     return True
                 else:  # include was defined, but not matched. So if not matched by old matcher, should be rejected!
                     accept = False
@@ -178,48 +190,6 @@ class Filterable:
                 return False
         return accept
 
-    def scope_inc_exc_matches(self, scope_inc_exc: Optional[list]):
-        return any(self.scope_matches(scope) for scope in scope_inc_exc)
-
-    def scope_matches(self, scope: Dict[str, List[str]]):
-        # scope is e.g. {'labels': ['app=oomki.*,app!=X.*Y']}
-        # or {'name': ['pod-xyz.*'], 'title': ['fdc.*a', 'fdd.*b'], 'type': ['ISSUE']}
-        for attr_name, attr_matchers in scope.items():
-            if not self.scope_attribute_matches(attr_name, attr_matchers):
-                return False
-        return True
-
-    def scope_attribute_matches(self, attr_name: str, attr_matchers: List[str]):
-        if attr_name not in self.attribute_map:
-            raise ValueError(f'Scope match on unknown attribute "{attr_name}"')
-        attr_value = self.attribute_map[attr_name]
-        for attr_matcher in attr_matchers:
-            if attr_name in ["labels", "annotations"]:
-                return self.match_labels_annotations(attr_matcher, attr_value)
-            elif re.fullmatch(attr_matcher, attr_value):
-                return True
-        return False
-
-    def match_labels_annotations(self, labels_match_expr: str, labels: Dict[str, str]):
-        for label_match in labels_match_expr.split(","):
-            if not self.label_matches(label_match, labels):
-                return False
-        return True
-
-    def label_matches(self, label_match: str, labels: Dict[str, str]):
-        label_name, label_regex = label_match.split("=", 1)
-        label_name = label_name.strip()
-        label_regex = label_regex.strip()
-        if label_name.endswith("!"):  # label_name!=match_expr
-            label_name = label_name[:-1].rstrip()
-            expect_match = False
-        else:
-            expect_match = True
-        label_value = labels.get(label_name)
-        if label_value is None:  # no label with that name
-            return False
-        return bool(re.fullmatch(label_regex, label_value.strip())) == expect_match
-
 
 class FindingSubject:
     def __init__(