robusta-cli 0.10.29__tar.gz → 0.10.30__tar.gz

{robusta_cli-0.10.29 → robusta_cli-0.10.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robusta-cli
-Version: 0.10.29
+Version: 0.10.30
 Summary: 
 Author: Natan Yellin
 Author-email: aantn@users.noreply.github.com
@@ -20,7 +20,7 @@ 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 (>=36.0.0,<37.0.0)
+Requires-Dist: cryptography (>=39.0.1,<40.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: dpath (>=2.0.5,<3.0.0)
@@ -34,13 +34,14 @@ Requires-Dist: markdown2 (>=2.4.2,<3.0.0)
 Requires-Dist: opsgenie-sdk (>=2.1.5,<3.0.0)
 Requires-Dist: poetry-core (==1.1.0a7) ; extra == "all"
 Requires-Dist: prometheus-client (>=0.12.0,<0.13.0)
-Requires-Dist: prometrix (==0.1.15)
+Requires-Dist: prometrix (==0.1.16)
 Requires-Dist: pydantic (>=1.8.1,<2.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)
 Requires-Dist: rocketchat-api (>=1.30.0,<2.0.0)
 Requires-Dist: sentry-sdk (>=1.5.2,<2.0.0) ; extra == "all"
+Requires-Dist: setuptools (>=68.2.2,<69.0.0)
 Requires-Dist: slack-sdk (>=3.23.0,<4.0.0)
 Requires-Dist: supabase (>=1.0.3,<2.0.0) ; extra == "all"
 Requires-Dist: tabulate (>=0.8.10,<0.9.0) ; extra == "all"

{robusta_cli-0.10.29 → robusta_cli-0.10.30}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "robusta-cli"
-version = "0.10.29"
+version = "0.10.30"
 description = ""
 authors = ["Natan Yellin <aantn@users.noreply.github.com>"]
 packages = [
@@ -25,6 +25,7 @@ robusta = "robusta.cli.main:app"
 # are known not to work on 3.11. Unfortunately this spec is shared between
 # the CLI and core, so we have to specify 3.8+.
 python = "^3.8, <3.11"
+setuptools = "^68.2.2"
 typer = "^0.4.1"
 colorlog = "^5.0.1"
 pydantic = "^1.8.1"
@@ -61,11 +62,11 @@ 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 = "^36.0.0"
+cryptography = "^39.0.1"
 PyJWT = "2.4.0"
 fpdf2 = "^2.7.1"
 attrs = "^23.1.0"
-prometrix = "0.1.15"
+prometrix = "0.1.16"
 hikaru-model-26 = "^1.1.1"
 apprise = "^1.5.0"
 rocketchat-api = "^1.30.0"
@@ -83,7 +84,7 @@ witchhazel = "^2018.8.23"
 sphinx-autodoc-typehints = "^1.12.0"
 sphinxcontrib-images = "^0.9.4"
 jsonref = "^0.2"
-Pillow = "^9.0.0"
+Pillow = "^10.2.0"
 sphinxcontrib-mermaid = "^0.7.1"
 humanize = "^3.13.1"
 cssselect = "^1.1.0"

{robusta_cli-0.10.29 → robusta_cli-0.10.30}/src/robusta/_version.py

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

{robusta_cli-0.10.29 → robusta_cli-0.10.30}/src/robusta/api/__init__.py

@@ -70,7 +70,6 @@ from robusta.core.model.env_vars import (
     ROBUSTA_LOGO_URL,
     ROBUSTA_TELEMETRY_ENDPOINT,
     ROBUSTA_UI_DOMAIN,
-    RSA_KEYS_PATH,
     RUNNER_VERSION,
     SEND_ADDITIONAL_TELEMETRY,
     SERVICE_CACHE_MAX_SIZE,
@@ -110,12 +109,13 @@ from robusta.core.playbooks.common import get_event_timestamp, get_resource_even
 from robusta.core.playbooks.container_playbook_utils import create_container_graph
 from robusta.core.playbooks.job_utils import CONTROLLER_UID, get_job_all_pods, get_job_latest_pod, get_job_selector
 from robusta.core.playbooks.node_playbook_utils import create_node_graph_enrichment
-from robusta.core.playbooks.pod_utils.crashloop_utils import get_crash_report_blocks
+from robusta.core.playbooks.pod_utils.crashloop_utils import get_crash_report_enrichments
 from robusta.core.playbooks.pod_utils.imagepull_utils import (
-    get_image_pull_backoff_blocks,
+    get_image_pull_backoff_enrichment,
     get_image_pull_backoff_container_statuses,
 )
-from robusta.core.playbooks.pod_utils.pending_pod_utils import get_pending_pod_blocks
+from robusta.core.playbooks.pod_utils.pending_pod_utils import get_pending_pod_enrichment
+from robusta.core.playbooks.crash_reporter import send_crash_report
 from robusta.core.playbooks.prometheus_enrichment_utils import (
     XAxisLine,
     create_chart_from_prometheus_query,
@@ -123,6 +123,7 @@ from robusta.core.playbooks.prometheus_enrichment_utils import (
     create_resource_enrichment,
     get_node_internal_ip,
     run_prometheus_query,
+    run_prometheus_query_range,
 )
 from robusta.core.playbooks.trigger import (
     BaseTrigger,
@@ -140,6 +141,7 @@ from robusta.core.reporting import (
     Emojis,
     Enrichment,
     FileBlock,
+    EmptyFileBlock,
     Filterable,
     Finding,
     FindingSeverity,

{robusta_cli-0.10.29 → robusta_cli-0.10.30}/src/robusta/cli/main.py

@@ -16,9 +16,7 @@ from kubernetes import client, config
 from pydantic import BaseModel, Extra
 
 from robusta._version import __version__
-from robusta.cli.auth import RSAKeyPair
 from robusta.cli.auth import app as auth_commands
-from robusta.cli.auth import gen_rsa_pair
 from robusta.cli.backend_profile import backend_profile
 from robusta.cli.eula import handle_eula
 from robusta.cli.integrations_cmd import app as integrations_commands
@@ -88,7 +86,6 @@ class HelmValues(BaseModel, extra=Extra.allow):
     kubewatch: Dict = None
     grafanaRenderer: Dict = None
     runner: Dict = None
-    rsa: RSAKeyPair = None
 
 
 def get_slack_channel() -> str:
@@ -266,7 +263,6 @@ def gen_config(
         enablePrometheusStack=enable_prometheus_stack,
         disableCloudRouting=disable_cloud_routing,
         enablePlatformPlaybooks=enable_platform_playbooks,
-        rsa=gen_rsa_pair(),
     )
 
     values.runner = {}
@@ -327,9 +323,6 @@ def update_config(
     """
     with open(existing_values, "r") as existing_values_file:
         values: HelmValues = HelmValues(**yaml.safe_load(existing_values_file))
-        if not values.rsa:
-            typer.secho("Generating RSA key-pair", fg="green")
-            values.rsa = gen_rsa_pair()
 
         if not values.globalConfig.signing_key:
             typer.secho("Generating signing key", fg="green")

{robusta_cli-0.10.29 → robusta_cli-0.10.30}/src/robusta/core/model/env_vars.py

@@ -17,6 +17,7 @@ DEFAULT_PLAYBOOKS_ROOT = os.environ.get("DEFAULT_PLAYBOOKS_ROOT", os.path.join(P
 DEFAULT_PLAYBOOKS_PIP_INSTALL = load_bool("DEFAULT_PLAYBOOKS_PIP_INSTALL", False)
 
 CUSTOM_PLAYBOOKS_ROOT = os.path.join(PLAYBOOKS_ROOT, "storage")
+CUSTOM_SSH_HOST_KEYS = os.environ.get("CUSTOM_SSH_HOST_KEYS", "")
 
 PLAYBOOKS_CONFIG_FILE_PATH = os.environ.get("PLAYBOOKS_CONFIG_FILE_PATH")
 
@@ -106,3 +107,5 @@ CLUSTER_DOMAIN = os.environ.get("CLUSTER_DOMAIN", "cluster.local")
 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)

{robusta_cli-0.10.29 → robusta_cli-0.10.30}/src/robusta/core/model/events.py

@@ -8,14 +8,16 @@ from typing import Any, Dict, List, Optional
 
 from pydantic import BaseModel
 
+from robusta.core.pubsub.event_emitter import EventEmitter
 from robusta.core.reporting.base import (
     BaseBlock,
+    EnrichmentType,
     Finding,
     FindingSeverity,
     FindingSource,
     FindingSubject,
     FindingSubjectType,
-    VideoLink, EnrichmentType,
+    VideoLink,
 )
 from robusta.core.sinks import SinkBase
 from robusta.integrations.scheduled.playbook_scheduler import PlaybooksScheduler
@@ -55,6 +57,7 @@ class ExecutionBaseEvent:
     stop_processing: bool = False
     _scheduler: Optional[PlaybooksScheduler] = None
     _context: Optional[ExecutionContext] = None
+    _event_emitter: Optional[EventEmitter] = None
 
     def set_context(self, context: ExecutionContext):
         self._context = context
@@ -68,6 +71,9 @@ class ExecutionBaseEvent:
     def get_scheduler(self) -> PlaybooksScheduler:
         return self._scheduler
 
+    def set_event_emitter(self, emitter: EventEmitter):
+        self._event_emitter = emitter
+
     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")
@@ -94,6 +100,12 @@ class ExecutionBaseEvent:
         for sink in self.named_sinks:
             self.sink_findings[sink][0].add_video_link(video_link, True)
 
+    def emit_event(self, event_name: str, **kwargs):
+        """Publish an event to the pubsub. It will be processed by the sinks during the execution of the playbook."""
+
+        if self._event_emitter:
+            self._event_emitter.emit_event(event_name, **kwargs)
+
     def add_enrichment(
         self,
         enrichment_blocks: List[BaseBlock],
@@ -103,8 +115,9 @@ class ExecutionBaseEvent:
     ):
         self.__prepare_sinks_findings()
         for sink in self.named_sinks:
-            self.sink_findings[sink][0].add_enrichment(enrichment_blocks, annotations, True,
-                                                       enrichment_type=enrichment_type, title=title)
+            self.sink_findings[sink][0].add_enrichment(
+                enrichment_blocks, annotations, True, enrichment_type=enrichment_type, title=title
+            )
 
     def add_finding(self, finding: Finding, suppress_warning: bool = False):
         finding.dirty = True  # Warn if new enrichments are added to this finding directly

robusta_cli-0.10.30/src/robusta/core/playbooks/crash_reporter.py

@@ -0,0 +1,65 @@
+import logging
+from typing import Optional
+
+from robusta.core.model.base_params import NamedRegexPattern
+from robusta.core.playbooks.pod_utils.crashloop_utils import get_crash_report_enrichments
+from robusta.core.reporting import Finding, FindingSource, FindingSeverity, FileBlock, EmptyFileBlock
+from robusta.core.reporting.base import EnrichmentType
+from robusta.core.reporting.finding_subjects import PodFindingSubject
+from robusta.integrations.kubernetes.autogenerated.events import PodEvent
+from robusta.integrations.kubernetes.custom_models import RegexReplacementStyle
+
+
+def send_crash_report(
+        event: PodEvent,
+        action_name: str,
+        regex_replacer_patterns: Optional[NamedRegexPattern] = None,
+        regex_replacement_style: Optional[RegexReplacementStyle] = None,
+):
+    pod = event.get_pod()
+
+    all_statuses = pod.status.containerStatuses + pod.status.initContainerStatuses
+    crashed_container_statuses = [
+        container_status
+        for container_status in all_statuses
+        if container_status.state.waiting is not None and container_status.restartCount >= 1
+    ]
+
+    finding = Finding(
+        title=f"Crashing pod {pod.metadata.name} in namespace {pod.metadata.namespace}",
+        source=FindingSource.KUBERNETES_API_SERVER,
+        severity=FindingSeverity.HIGH,
+        aggregation_key=action_name,
+        subject=PodFindingSubject(pod),
+    )
+
+    enrichments = get_crash_report_enrichments(pod)
+    for enrichment in enrichments:
+        finding.add_enrichment(enrichment.blocks,
+                               enrichment_type=enrichment.enrichment_type,
+                               title=enrichment.title)
+
+    for container_status in crashed_container_statuses:
+        try:
+            container_log = pod.get_logs(
+                container_status.name,
+                previous=True,
+                regex_replacer_patterns=regex_replacer_patterns,
+                regex_replacement_style=regex_replacement_style,
+            )
+
+            if not container_log:
+                log_block = EmptyFileBlock(filename=f"{pod.metadata.name}.log",
+                                           remarks=f"Logs unavailable for container: {container_status.name}")
+                logging.info(
+                    f"could not fetch logs from container: {container_status.name}"
+                )
+            else:
+                log_block = FileBlock(filename=f"{pod.metadata.name}.log", contents=container_log.encode())
+
+            finding.add_enrichment([log_block],
+                                   enrichment_type=EnrichmentType.text_file, title="Logs")
+        except Exception:
+            logging.error("Failed to get pod logs", exc_info=True)
+
+        event.add_finding(finding)

{robusta_cli-0.10.29 → robusta_cli-0.10.30}/src/robusta/core/playbooks/oom_killer_utils.py

@@ -3,6 +3,7 @@ import time
 
 from robusta.api import (
     ExecutionBaseEvent,
+    EmptyFileBlock,
     FileBlock,
     LogEnricherParams,
     MarkdownBlock,
@@ -10,6 +11,7 @@ from robusta.api import (
     RegexReplacementStyle,
     RobustaPod,
 )
+from robusta.core.playbooks.pod_utils.crashloop_utils import get_crash_report_enrichments
 from robusta.core.reporting.base import EnrichmentType
 
 
@@ -40,11 +42,19 @@ def start_log_enrichment(
         RegexReplacementStyle[params.regex_replacement_style] if params.regex_replacement_style else None
     )
 
+    enrichments = get_crash_report_enrichments(pod)
+    for enrichment in enrichments:
+        event.add_enrichment(enrichment.blocks,
+                             enrichment_type=enrichment.enrichment_type,
+                             title=enrichment.title)
+
     if not container and pod.spec.containers:
         # TODO do we want to keep this part of code? It used to sometimes report logs for a wrong
         #  container when a container inside a pod was oomkilled. I can imagine it could cause
         #  similar problems in other cases.
         container = pod.spec.containers[0].name
+
+    log_data = ""
     for _ in range(tries - 1):
         log_data = pod.get_logs(
             container=container,
@@ -57,15 +67,19 @@ def start_log_enrichment(
             logging.info("log data is empty, retrying...")
             time.sleep(backoff_seconds)
             continue
+        break
 
-        log_name = pod.metadata.name
-        log_name += f"/{container}"
-        event.add_enrichment(
-            [FileBlock(filename=f"{pod.metadata.name}.log", contents=log_data.encode())],
-            enrichment_type=EnrichmentType.text_file,
-            title="Pod Logs"
+    if not log_data:
+        log_block = EmptyFileBlock(filename=f"{pod.metadata.name}.log",
+                                   remarks=f"Logs unavailable for container: {container}")
+        logging.info(
+            f"could not fetch logs from container: {container}"
         )
-        break
+    else:
+        log_block = FileBlock(filename=f"{pod.metadata.name}.log", contents=log_data.encode())
+
+    event.add_enrichment([log_block],
+                         enrichment_type=EnrichmentType.text_file, title="Logs")
 
 
 def logs_enricher(event: PodEvent, params: LogEnricherParams):

{robusta_cli-0.10.29 → robusta_cli-0.10.30}/src/robusta/core/playbooks/playbooks_event_handler_impl.py

@@ -128,6 +128,7 @@ class PlaybooksEventHandlerImpl(PlaybooksEventHandler):
 
     def __prepare_execution_event(self, execution_event: ExecutionBaseEvent):
         execution_event.set_scheduler(self.registry.get_scheduler())
+        execution_event.set_event_emitter(self.registry.get_event_emitter())
         execution_event.set_all_sinks(self.registry.get_sinks().get_all())
         execution_event.set_context(
             ExecutionContext(

robusta_cli-0.10.30/src/robusta/core/playbooks/pod_utils/crashloop_utils.py

@@ -0,0 +1,61 @@
+from typing import List, Optional
+
+from hikaru.model.rel_1_26 import Pod
+
+from robusta.core.reporting import TableBlock
+from robusta.core.reporting.base import Enrichment, EnrichmentType
+
+
+def get_crash_report_enrichments(
+    pod: Pod,
+) -> List[Enrichment]:
+    all_statuses = pod.status.containerStatuses + pod.status.initContainerStatuses
+    crashed_container_statuses = [
+        container_status
+        for container_status in all_statuses
+        if container_status.state.waiting is not None and container_status.restartCount >= 1
+    ]
+
+    pod_issues_enrichments: List[Enrichment] = []
+
+    for container_status in crashed_container_statuses:
+        crash_info_rows: List[List[str]] = []
+        prev_container_rows: List[List[str]] = []
+
+        crash_info_rows.append(["Container", container_status.name])
+        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])
+
+        if container_status.state and container_status.state.waiting:
+            crash_info_rows.append(["Status", "WAITING"])
+            crash_info_rows.append(["Reason", container_status.state.waiting.reason])
+
+        if container_status.lastState and container_status.lastState.terminated:
+            prev_container_rows.append(["Status", "TERMINATED"])
+            prev_container_rows.append(["Reason", container_status.lastState.terminated.reason])
+            if container_status.lastState.terminated.startedAt:
+                prev_container_rows.append(["Started at", container_status.lastState.terminated.startedAt])
+            if container_status.lastState.terminated.finishedAt:
+                prev_container_rows.append(["Finished at", container_status.lastState.terminated.finishedAt])
+
+        crash_info_table_block = TableBlock(
+            [[k, v] for (k, v) in crash_info_rows],
+            ["label", "value"],
+            table_name="*Crash Info*",
+        )
+        prev_container_table_block = TableBlock(
+            [[k, v] for (k, v) in prev_container_rows],
+            ["label", "value"],
+            table_name="*Previous Container*",
+        )
+
+        pod_issues_enrichments.append(Enrichment(enrichment_type=EnrichmentType.crash_info,
+                                                 title="Container Crash information",
+                                                 blocks=[crash_info_table_block, prev_container_table_block]))
+
+    return pod_issues_enrichments

{robusta_cli-0.10.29 → robusta_cli-0.10.30}/src/robusta/core/playbooks/pod_utils/imagepull_utils.py

@@ -7,15 +7,15 @@ from typing import List, Optional, Tuple
 
 from hikaru.model.rel_1_26 import ContainerStatus, Event, EventList, Pod, PodStatus
 
-from robusta.core.reporting import BaseBlock, HeaderBlock, MarkdownBlock
+from robusta.core.reporting import BaseBlock, MarkdownBlock, TableBlock
+from robusta.core.reporting.base import EnrichmentType, Enrichment
 
 
 class ImagePullBackoffReason(Flag):
     Unknown = 0
     RepoDoesntExist = 1
     NotAuthorized = 2
-    ImageDoesntExist = 4
-    TagNotFound = 8
+    Timeout = 16
 
 
 def get_image_pull_backoff_container_statuses(status: PodStatus) -> List[ContainerStatus]:
@@ -43,26 +43,19 @@ def get_pod_issue_message_and_reason(pod: Pod) -> Tuple[Optional[str], Optional[
     return None, None
 
 
-def decompose_flag(flag: Flag) -> List[Flag]:
-    members, _ = enum._decompose(flag.__class__, flag._value_)
-    return members
-
-
-def get_image_pull_backoff_blocks(pod: Pod) -> Optional[List[BaseBlock]]:
-    blocks: List[BaseBlock] = []
+def get_image_pull_backoff_enrichment(pod: Pod) -> Enrichment:
+    error_blocks: List[BaseBlock] = []
+    image_pull_table_blocks: List[BaseBlock] = []
     pod_name = pod.metadata.name
     namespace = pod.metadata.namespace
     image_pull_backoff_container_statuses = get_image_pull_backoff_container_statuses(pod.status)
     investigator = ImagePullBackoffInvestigator(pod_name, namespace)
+
     for container_status in image_pull_backoff_container_statuses:
-        investigation = investigator.investigate(container_status)
+        image_issue_rows: List[List[str]] = \
+            [["Container", container_status.name], ["Image", container_status.image]]
 
-        blocks.extend(
-            [
-                HeaderBlock(f"ImagePullBackOff in container {container_status.name}"),
-                MarkdownBlock(f"*Image:* {container_status.image}"),
-            ]
-        )
+        investigation = investigator.investigate(container_status)
 
         # TODO: this happens when there is a backoff but the original events containing the actual error message are already gone
         # and all that remains is a backoff event without a detailed error message - maybe we should identify that case and
@@ -85,26 +78,39 @@ def get_image_pull_backoff_blocks(pod: Pod) -> Optional[List[BaseBlock]]:
 
         reason = investigation.reason
         error_message = investigation.error_message
-
         if reason != ImagePullBackoffReason.Unknown:
-            reasons = decompose_flag(reason)
-
-            if len(reasons) == 1:
-                blocks.extend(
-                    [
-                        MarkdownBlock(f"*Reason:* {reason}"),
-                    ]
-                )
-            else:
-                line_separated_reasons = "\n".join([f"{r}" for r in reasons])
-                blocks.extend(
-                    [
-                        MarkdownBlock(f"*Possible reasons:*\n{line_separated_reasons}"),
-                    ]
-                )
+            backoff_reason = __imagepull_backoff_reason_to_fix(reason=reason)
+
+            if backoff_reason:
+                reason_text, fix = backoff_reason
+                image_issue_rows.append(["Reason", reason_text])
+                image_issue_rows.append(["Fix", fix])
+
         else:
-            blocks.append(MarkdownBlock(f"*Error message:* {container_status.name}:\n{error_message}"))
-    return blocks
+            error_blocks.append(MarkdownBlock(f"*Error message:* {container_status.name}:\n{error_message}"))
+
+        image_pull_table_blocks.append(TableBlock(
+            [[k, v] for (k, v) in image_issue_rows],
+            ["label", "value"],
+        ))
+
+    image_pull_table_blocks.extend(error_blocks)
+
+    return Enrichment(
+        enrichment_type=EnrichmentType.image_pull_backoff_info,
+        blocks=image_pull_table_blocks,
+        title="Container Image-Pull-Backoff Information")
+
+
+def __imagepull_backoff_reason_to_fix(reason: ImagePullBackoffReason) -> Optional[Tuple[str, str]]:
+    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>'
+    if reason == ImagePullBackoffReason.Timeout:
+        return "Timeout", 'If this does not resolved after a few minutes, make sure the image repository is responding.'
+
+    return None
 
 
 class ImagePullOffInvestigation:
@@ -121,9 +127,7 @@ class ImagePullBackoffInvestigator:
         # Containerd
         {
             "err_template": 'failed to pull and unpack image ".*?": failed to resolve reference ".*?": .*?: not found',
-            "reason": ImagePullBackoffReason.RepoDoesntExist
-            | ImagePullBackoffReason.ImageDoesntExist
-            | ImagePullBackoffReason.TagNotFound,
+            "reason": ImagePullBackoffReason.RepoDoesntExist,
         },
         {
             "err_template": (
@@ -131,7 +135,7 @@ class ImagePullBackoffInvestigator:
                 "pull access denied, repository does not exist or may require authorization: server message: "
                 "insufficient_scope: authorization failed"
             ),
-            "reason": ImagePullBackoffReason.NotAuthorized | ImagePullBackoffReason.ImageDoesntExist,
+            "reason": ImagePullBackoffReason.NotAuthorized,
         },
         {
             "err_template": (
@@ -146,11 +150,11 @@ class ImagePullBackoffInvestigator:
                 "Error response from daemon: pull access denied for .*?, "
                 "repository does not exist or may require 'docker login': denied: requested access to the resource is denied"
             ),
-            "reason": ImagePullBackoffReason.NotAuthorized | ImagePullBackoffReason.ImageDoesntExist,
+            "reason": ImagePullBackoffReason.NotAuthorized,
         },
         {
             "err_template": "Error response from daemon: manifest for .*? not found: manifest unknown: manifest unknown",
-            "reason": ImagePullBackoffReason.TagNotFound,
+            "reason": ImagePullBackoffReason.RepoDoesntExist,
         },
         {
             "err_template": (
@@ -161,8 +165,12 @@ class ImagePullBackoffInvestigator:
         },
         {
             "err_template": 'Error response from daemon: manifest for .*? not found: manifest unknown: Failed to fetch ".*?"',
-            "reason": ImagePullBackoffReason.ImageDoesntExist | ImagePullBackoffReason.TagNotFound,
+            "reason": ImagePullBackoffReason.RepoDoesntExist,
         },
+        {
+            "err_template": r'.*Timeout exceeded.*',
+            "reason": ImagePullBackoffReason.Timeout,  # Using the Timeout reason
+        }
     ]
 
     def __init__(self, pod_name: str, namespace: str):

{robusta_cli-0.10.29 → robusta_cli-0.10.30}/src/robusta/core/playbooks/pod_utils/pending_pod_utils.py

@@ -7,17 +7,23 @@ from hikaru.model.rel_1_26 import Event, EventList, Pod
 
 from robusta.core.model.pods import pod_other_requests, pod_requests
 from robusta.core.playbooks.common import get_event_timestamp
-from robusta.core.reporting.blocks import BaseBlock, MarkdownBlock
+from robusta.core.reporting import Enrichment
+from robusta.core.reporting.base import EnrichmentType
+from robusta.core.reporting.blocks import BaseBlock, MarkdownBlock, TableBlock
 
 
-def get_pending_pod_blocks(pod: Pod):
-    blocks: List[BaseBlock] = []
+def get_pending_pod_enrichment(pod: Pod) -> Enrichment:
     investigator = PendingInvestigator(pod)
     all_reasons = investigator.investigate()
     message = get_unscheduled_message(pod)
-    blocks.append(MarkdownBlock(f"Pod {pod.metadata.name} could not be scheduled."))
+    pending_rows = [["Pod", pod.metadata.name]]
     if message:
-        blocks.append(MarkdownBlock(f"*Reason:* {message}"))
+        pending_rows.append(["Reason", message])
+
+    blocks = [TableBlock(
+        [[k, v] for (k, v) in pending_rows],
+        ["label", "value"],
+    )]
 
     if all_reasons:
         RESOURCE_REASONS = [
@@ -39,7 +45,10 @@ def get_pending_pod_blocks(pod: Pod):
             resources_string = ", ".join(request_resources)
             blocks.append(MarkdownBlock(f"*Pod requires:* {resources_string}"))
 
-    return blocks
+    return Enrichment(
+        enrichment_type=EnrichmentType.pending_pod_info,
+        blocks=blocks,
+        title="Unscheduled Pod Information")
 
 
 def get_unscheduled_message(pod: Pod) -> Optional[str]: