robusta-cli 0.10.27a2__tar.gz → 0.10.28a0__tar.gz

{robusta_cli-0.10.27a2 → robusta_cli-0.10.28a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robusta-cli
-Version: 0.10.27a2
+Version: 0.10.28a0
 Summary: 
 Author: Natan Yellin
 Author-email: aantn@users.noreply.github.com

{robusta_cli-0.10.27a2 → robusta_cli-0.10.28a0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "robusta-cli"
-version = "0.10.27-alpha2"
+version = "0.10.28-alpha"
 description = ""
 authors = ["Natan Yellin <aantn@users.noreply.github.com>"]
 packages = [

{robusta_cli-0.10.27a2 → robusta_cli-0.10.28a0}/src/robusta/_version.py

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

{robusta_cli-0.10.27a2 → robusta_cli-0.10.28a0}/src/robusta/api/__init__.py

@@ -33,6 +33,8 @@ from robusta.core.model.base_params import (
     ResourceChartItemType,
     ResourceChartResourceType,
     ResourceGraphEnricherParams,
+    OOMGraphEnricherParams,
+    OomKillParams,
     TimedPrometheusParams,
     VideoEnricherParams,
 )
@@ -153,8 +155,11 @@ from robusta.core.reporting import (
     ScanReportBlock,
     ScanReportRow,
     TableBlock,
-    VideoLink,
+    VideoLink
 )
+
+from robusta.core.reporting.base import EnrichmentType
+from robusta.core.reporting.blocks import GraphBlock
 from robusta.core.reporting.action_requests import (
     ActionRequestBody,
     ExternalActionRequest,
@@ -182,6 +187,7 @@ from robusta.core.schedule.model import (
     ScheduledJob,
     SchedulingInfo,
 )
+from robusta.core.playbooks.node_playbook_utils import create_node_graph_enrichment
 from robusta.core.sinks import SinkBase, SinkBaseParams, SinkConfigBase
 from robusta.core.sinks.kafka import KafkaSink, KafkaSinkConfigWrapper, KafkaSinkParams
 from robusta.core.triggers.helm_releases_triggers import HelmReleasesEvent, HelmReleasesTriggerEvent

{robusta_cli-0.10.27a2 → robusta_cli-0.10.28a0}/src/robusta/cli/backend_profile.py

@@ -4,6 +4,8 @@ import sys
 import typer
 from pydantic.main import BaseModel
 
+from robusta.cli.utils import host_for_params
+
 ROBUSTA_BACKEND_PROFILE = os.environ.get("ROBUSTA_BACKEND_PROFILE", "")
 
 
@@ -17,14 +19,16 @@ class BackendProfile(BaseModel):
     custom_profile: bool = False
 
     @classmethod
-    def fromDomain(cls, domain: str):
+    def fromDomainProvider(
+        cls, domain: str, api_endpoint_prefix: str, platform_endpoint_prefix: str, relay_endpoint_prefix: str
+    ):
         return cls(
-            robusta_cloud_api_host=f"https://api.{domain}",
-            robusta_ui_domain=f"https://platform.{domain}",
-            robusta_relay_ws_address=f"wss://relay.{domain}",
-            robusta_relay_external_actions_url=f"https://api.{domain}/integrations/generic/actions",
-            robusta_telemetry_endpoint=f"https://api.{domain}/telemetry",
-            robusta_store_token_url=f"https://api.{domain}/auth/server/tokens",
+            robusta_cloud_api_host=host_for_params(api_endpoint_prefix, domain),
+            robusta_ui_domain=host_for_params(platform_endpoint_prefix, domain),
+            robusta_relay_ws_address=host_for_params(relay_endpoint_prefix, domain, "wss"),
+            robusta_relay_external_actions_url=f"{host_for_params(api_endpoint_prefix, domain)}/integrations/generic/actions",
+            robusta_telemetry_endpoint=f"{host_for_params(api_endpoint_prefix, domain)}/telemetry",
+            robusta_store_token_url=f"{host_for_params(api_endpoint_prefix, domain)}/auth/server/tokens",
         )
 
 

{robusta_cli-0.10.27a2 → robusta_cli-0.10.28a0}/src/robusta/cli/self_host.py

@@ -10,6 +10,7 @@ import yaml
 from pydantic import BaseModel
 
 from robusta.cli.backend_profile import BackendProfile
+from robusta.cli.utils import host_for_params
 
 ISSUER: str = "supabase"
 
@@ -47,13 +48,15 @@ class RobustaUI(BaseModel):
     RELAY_HOST: str
     SUPABASE_URL: str
     SUPABASE_KEY: str
+    provider: str
     service = {"nodePort": 30311}  # platform.domain
 
-    def __init__(self, domain: str, anon_key: str):
+    def __init__(self, domain: str, anon_key: str, provider: str, api_endpoint_prefix: str, db_endpoint_prefix: str):
         super().__init__(
-            RELAY_HOST=f"https://api.{domain}",
-            SUPABASE_URL=f"https://db.{domain}",
+            RELAY_HOST=host_for_params(api_endpoint_prefix, domain),
+            SUPABASE_URL=host_for_params(db_endpoint_prefix, domain),
             SUPABASE_KEY=anon_key,
+            provider=provider,
         )
 
 
@@ -68,17 +71,28 @@ class RobustaRelay(BaseModel):
     slackSigningSecret: str = "your-signing-secret"
     syncActionAllowedOrigins: str
     provider: str
+    apiEndpointPrefix: str
     apiNodePort: int = 30313  # api.domain
     wsNodePort: int = 30314  # relay.domain
 
-    def __init__(self, domain: str, anon_key: str, provider: str, storePW: str):
+    def __init__(
+        self,
+        domain: str,
+        anon_key: str,
+        provider: str,
+        storePW: str,
+        db_endpoint_prefix: str,
+        platform_endpoint_prefix: str,
+        api_endpoint_prefix: str,
+    ):
         super().__init__(
             domain=domain,
-            storeUrl=f"https://db.{domain}",
-            syncActionAllowedOrigins=f"https://platform.{domain}",
+            storeUrl=host_for_params(db_endpoint_prefix, domain),
+            syncActionAllowedOrigins=host_for_params(platform_endpoint_prefix, domain),
             storeApiKey=anon_key,
             provider=provider,
             storePassword=storePW,
+            apiEndpointPrefix=api_endpoint_prefix,
         )
 
 
@@ -131,7 +145,7 @@ app = typer.Typer(add_completion=False)
 def gen_config(
     provider: str = typer.Option(
         ...,
-        help='Cloud host provider. options are "on-prem", "gke", "eks"',
+        help='Cloud host provider. options are "on-prem", "gke", "eks", "openshift"',
     ),
     domain: str = typer.Option(..., help="domain used to route the on-prem services."),
     storage_class_name: str = typer.Option(None, help="database PVC storageClassName."),
@@ -140,11 +154,15 @@ def gen_config(
     db_nport: int = typer.Option(30312, help="node port Robusta database."),
     api_nport: int = typer.Option(30313, help="node port for Robusta API."),
     ws_nport: int = typer.Option(30314, help="node port for Robusta websocket."),
+    db_endpoint_prefix: str = typer.Option("db", help="Endpoint prefix for the db"),
+    api_endpoint_prefix: str = typer.Option("api", help="Endpoint prefix for the api"),
+    platform_endpoint_prefix: str = typer.Option("platform", help="Endpoint prefix for the platform"),
+    relay_ws_endpoint_prefix: str = typer.Option("relay", help="Endpoint prefix for the relay websocket"),
 ):
     """Create self host configuration files"""
-    if provider not in {"on-prem", "gke", "eks"}:
+    if provider not in {"on-prem", "gke", "eks", "openshift"}:
         typer.secho(
-            f'Invalid provider {provider}. options are "on-prem", "gke", "eks"',
+            f'Invalid provider {provider}. options are "on-prem", "gke", "eks", "openshift"',
             fg=typer.colors.RED,
         )
         return
@@ -159,8 +177,8 @@ def gen_config(
     values = SelfHostValues(
         PROVIDER=provider,
         DOMAIN=domain,
-        SITE_URL=f"https://platform.{domain}",
-        PUBLIC_REST_URL=f"https://db.{domain}/rest/v1/",
+        SITE_URL=host_for_params(platform_endpoint_prefix, domain),
+        PUBLIC_REST_URL=f"{host_for_params(db_endpoint_prefix, domain)}/rest/v1/",
         STORAGE_CLASS_NAME=storage_class_name,
         EKS_CERTIFICATE_ARN=eks_certificate_arn,
     )
@@ -171,18 +189,38 @@ def gen_config(
         anon_key=values.ANON_KEY,
         provider=provider,
         storePW=values.RELAY_PASSWORD,
+        db_endpoint_prefix=db_endpoint_prefix,
+        platform_endpoint_prefix=platform_endpoint_prefix,
+        api_endpoint_prefix=api_endpoint_prefix,
     )
     relayValues.apiNodePort = api_nport
     relayValues.wsNodePort = ws_nport
 
-    uiValues = RobustaUI(domain=domain, anon_key=values.ANON_KEY)
+    uiValues = RobustaUI(
+        domain=domain,
+        anon_key=values.ANON_KEY,
+        provider=provider,
+        api_endpoint_prefix=api_endpoint_prefix,
+        db_endpoint_prefix=db_endpoint_prefix,
+    )
     uiValues.service["nodePort"] = platform_nport
 
     values_dict = values.dict(exclude_none=True)
     values_dict["robusta-ui"] = uiValues.dict()
     values_dict["robusta-relay"] = relayValues.dict()
-
-    backendProfile = BackendProfile.fromDomain(domain=domain)
+    values_dict["ENDPOINT_PREFIXES"] = {
+        "DB": db_endpoint_prefix,
+        "API": api_endpoint_prefix,
+        "PLATFORM": platform_endpoint_prefix,
+        "RELAY": relay_ws_endpoint_prefix,
+    }
+
+    backendProfile = BackendProfile.fromDomainProvider(
+        domain=domain,
+        api_endpoint_prefix=api_endpoint_prefix,
+        platform_endpoint_prefix=platform_endpoint_prefix,
+        relay_endpoint_prefix=relay_ws_endpoint_prefix,
+    )
     self_host_approval_url = "https://api.robusta.dev/terms-of-service.html"
     typer.echo(f"By using this software you agree to the terms of service ({self_host_approval_url})\n")
     write_values_files("self_host_values.yaml", "robusta_cli_config.json", values_dict, backendProfile)

{robusta_cli-0.10.27a2 → robusta_cli-0.10.28a0}/src/robusta/cli/utils.py

@@ -91,6 +91,10 @@ def replace_in_file(path, original, replacement):
         w.write(text)
 
 
+def host_for_params(component, domain, scheme="https"):
+    return f"{scheme}://{component}.{domain}"
+
+
 @contextmanager
 def fetch_runner_logs(namespace: Optional[str], all_logs=False):
     start = time.time()
@@ -134,6 +138,9 @@ def get_runner_pod(namespace: Optional[str]) -> str:
     ).stdout.strip()
 
     if not output:
-        typer.secho(f"Could not find robusta pod in namespace {namespace}. Are you missing the --namespace flag correctly?", fg="red")
-    
-    return output
+        typer.secho(
+            f"Could not find robusta pod in namespace {namespace}. Are you missing the --namespace flag correctly?",
+            fg="red",
+        )
+
+    return output

{robusta_cli-0.10.27a2 → robusta_cli-0.10.28a0}/src/robusta/core/model/base_params.py

@@ -4,6 +4,7 @@ from typing import Dict, List, Optional, Union
 
 from pydantic import BaseModel, SecretStr, validator
 
+from robusta.integrations import openshift
 from robusta.utils.documented_pydantic import DocumentedModel
 
 
@@ -17,6 +18,8 @@ class ChartValuesFormat(Enum):
     Percentage = auto()
     CPUUsage = auto()
 
+    def __str__(self):
+        return self.name
 
 class ResourceChartItemType(Enum):
     """
@@ -148,6 +151,19 @@ class PrometheusParams(ActionParams):
             logging.info(f"Stripping '?' off prometheus_url_query_string: {v}")
         return v
 
+    @validator("prometheus_auth", allow_reuse=True, always=True)
+    def auto_openshift_token(cls, v: Optional[SecretStr]):
+        # If openshift is enabled, and the user didn't configure prometheus_auth, we will try to load the token from the service account
+        if v is not None:
+            return v
+
+        openshift_token = openshift.load_token()
+        if openshift_token is not None:
+            logging.debug(f"Using openshift token from {openshift.TOKEN_LOCATION} for prometheus auth")
+            return SecretStr(f"Bearer {openshift_token}")
+
+        return None
+
 
 class PrometheusDuration(BaseModel):
     """
@@ -208,6 +224,7 @@ class CustomGraphEnricherParams(PrometheusParams):
     graph_title: Optional[str] = None
     graph_duration_minutes: int = 60
     chart_values_format: str = "Plain"
+    hide_legends: Optional[bool] = False
 
 
 class ResourceGraphEnricherParams(PrometheusParams):
@@ -310,5 +327,20 @@ class LogEnricherParams(ActionParams):
     filter_regex: Optional[str] = None
 
 
-class OomKillParams(ActionParams):
+class OOMGraphEnricherParams(ResourceGraphEnricherParams):
+    """
+    :var delay_graph_s: the amount of seconds to delay getting the graph inorder to record the memory spike
+    """
+
+    delay_graph_s: int = 0
+
+
+class OomKillParams(OOMGraphEnricherParams):
     attach_logs: Optional[bool] = False
+    container_memory_graph: Optional[bool] = False
+    node_memory_graph: Optional[bool] = False
+
+    def __init__(self, attach_logs: Optional[bool] = False, container_memory_graph: Optional[bool] = False,
+                 node_memory_graph: Optional[bool] = False, **kwargs):
+        super().__init__(attach_logs=attach_logs, container_memory_graph=container_memory_graph,
+                         node_memory_graph=node_memory_graph, resource_type=ResourceChartResourceType.Memory.name, **kwargs)

{robusta_cli-0.10.27a2 → robusta_cli-0.10.28a0}/src/robusta/core/model/env_vars.py

@@ -77,6 +77,7 @@ WEBSOCKET_PING_INTERVAL = int(os.environ.get("WEBSOCKET_PING_INTERVAL", 120))
 WEBSOCKET_PING_TIMEOUT = int(os.environ.get("WEBSOCKET_PING_TIMEOUT", 30))
 
 TRACE_INCOMING_REQUESTS = load_bool("TRACE_INCOMING_REQUESTS", False)
+TRACE_INCOMING_ALERTS = load_bool("TRACE_INCOMING_ALERTS", False)
 
 SERVICE_CACHE_TTL_SEC = int(os.environ.get("SERVICE_CACHE_TTL_SEC", 900))
 SERVICE_CACHE_MAX_SIZE = int(os.environ.get("SERVICE_CACHE_MAX_SIZE", 1000))
@@ -87,7 +88,7 @@ PORT = int(os.environ.get("PORT", 5000))  # PORT
 ADDITIONAL_CERTIFICATE: str = os.environ.get("CERTIFICATE", "")
 
 DISCOVERY_MAX_BATCHES = int(os.environ.get("DISCOVERY_MAX_BATCHES", 25))
-DISCOVERY_BATCH_SIZE = int(os.environ.get("DISCOVERY_BATCH_SIZE", 2000))
+DISCOVERY_BATCH_SIZE = int(os.environ.get("DISCOVERY_BATCH_SIZE", 30000))
 DISCOVERY_POD_OWNED_PODS = load_bool("DISCOVERY_POD_OWNED_PODS", False)
 
 DISABLE_HELM_MONITORING = load_bool("DISABLE_HELM_MONITORING", False)
@@ -101,3 +102,7 @@ MAX_ALLOWED_RULES_PER_CRD_ALERT = int(os.environ.get("MAX_ALLOWED_RULES_PER_CRD_
 IMAGE_REGISTRY = os.environ.get("IMAGE_REGISTRY", "us-central1-docker.pkg.dev/genuine-flight-317411/devel")
 
 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)

{robusta_cli-0.10.27a2 → robusta_cli-0.10.28a0}/src/robusta/core/model/events.py

@@ -15,7 +15,7 @@ from robusta.core.reporting.base import (
     FindingSource,
     FindingSubject,
     FindingSubjectType,
-    VideoLink,
+    VideoLink, EnrichmentType,
 )
 from robusta.core.sinks import SinkBase
 from robusta.integrations.scheduled.playbook_scheduler import PlaybooksScheduler
@@ -95,10 +95,13 @@ class ExecutionBaseEvent:
         self,
         enrichment_blocks: List[BaseBlock],
         annotations=None,
+        enrichment_type: Optional[EnrichmentType] = None,
+        title: Optional[str] = None,
     ):
         self.__prepare_sinks_findings()
         for sink in self.named_sinks:
-            self.sink_findings[sink][0].add_enrichment(enrichment_blocks, annotations, True)
+            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.27a2 → robusta_cli-0.10.28a0}/src/robusta/core/model/runner_config.py

@@ -7,6 +7,7 @@ from robusta.core.playbooks.playbook_utils import get_env_replacement, replace_e
 from robusta.core.sinks.datadog.datadog_sink_params import DataDogSinkConfigWrapper
 from robusta.core.sinks.discord.discord_sink_params import DiscordSinkConfigWrapper
 from robusta.core.sinks.file.file_sink_params import FileSinkConfigWrapper
+from robusta.core.sinks.google_chat.google_chat_params import GoogleChatSinkConfigWrapper
 from robusta.core.sinks.jira.jira_sink_params import JiraSinkConfigWrapper
 from robusta.core.sinks.kafka.kafka_sink_params import KafkaSinkConfigWrapper
 from robusta.core.sinks.mattermost.mattermost_sink_params import MattermostSinkConfigWrapper
@@ -22,6 +23,7 @@ from robusta.core.sinks.victorops.victorops_sink_params import VictoropsConfigWr
 from robusta.core.sinks.webex.webex_sink_params import WebexSinkConfigWrapper
 from robusta.core.sinks.webhook.webhook_sink_params import WebhookSinkConfigWrapper
 from robusta.core.sinks.yamessenger.yamessenger_sink_params import YaMessengerSinkConfigWrapper
+from robusta.core.sinks.pushover.pushover_sink_params import PushoverSinkConfigWrapper
 from robusta.model.alert_relabel_config import AlertRelabel
 from robusta.model.playbook_definition import PlaybookDefinition
 from robusta.utils.base64_utils import is_base64_encoded
@@ -57,6 +59,8 @@ class RunnerConfig(BaseModel):
                 JiraSinkConfigWrapper,
                 FileSinkConfigWrapper,
                 MailSinkConfigWrapper,
+                PushoverSinkConfigWrapper,
+                GoogleChatSinkConfigWrapper,
             ]
         ]
     ]

{robusta_cli-0.10.27a2 → robusta_cli-0.10.28a0}/src/robusta/core/playbooks/container_playbook_utils.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from typing import Optional, List
 
 from hikaru.model.rel_1_26 import Container, Pod
 
@@ -8,7 +9,8 @@ from robusta.core.playbooks.prometheus_enrichment_utils import XAxisLine, YAxisL
 from robusta.integrations.kubernetes.api_client_utils import parse_kubernetes_datetime
 
 
-def create_container_graph(params: ResourceGraphEnricherParams, pod: Pod, oomkilled_container: PodContainer, show_limit=False):
+def create_container_graph(params: ResourceGraphEnricherParams, pod: Pod, oomkilled_container: PodContainer, show_limit=False,
+                           metrics_legends_labels: Optional[List[str]] = None,):
     container = oomkilled_container.container
     oom_killed_status = oomkilled_container.state
     labels = {
@@ -62,5 +64,6 @@ def create_container_graph(params: ResourceGraphEnricherParams, pod: Pod, oomkil
         graph_duration_minutes=params.graph_duration_minutes,
         lines=limit_lines,
         title_override=f"{params.resource_type} Usage for container {container.name}",
+        metrics_legends_labels=metrics_legends_labels,
     )
     return graph_enrichment

{robusta_cli-0.10.27a2 → robusta_cli-0.10.28a0}/src/robusta/core/playbooks/internal/discovery_events.py

@@ -15,6 +15,7 @@ from robusta.api import (
 )
 from robusta.core.discovery.top_service_resolver import TopLevelResource, TopServiceResolver
 from robusta.core.playbooks.common import get_event_timestamp, get_events_list
+from robusta.core.reporting.base import EnrichmentType
 
 
 @action
@@ -53,7 +54,7 @@ def event_history(event: ExecutionBaseEvent):
             warning_event.regarding.namespace,
         )
         if events_table:
-            finding.add_enrichment([events_table])
+            finding.add_enrichment([events_table], enrichment_type=EnrichmentType.k8s_events, title="Resource Events")
             event.add_finding(finding, True)
         reported_obj_history_list.append(warning_event_key)
 

{robusta_cli-0.10.27a2 → robusta_cli-0.10.28a0}/src/robusta/core/playbooks/node_playbook_utils.py

@@ -1,12 +1,15 @@
 from datetime import datetime
+from typing import Optional, List
 
 from hikaru.model.rel_1_26 import Node
 
 from robusta.core.model.base_params import ResourceChartItemType, ResourceChartResourceType, ResourceGraphEnricherParams
 from robusta.core.playbooks.prometheus_enrichment_utils import create_resource_enrichment, get_node_internal_ip
+from robusta.core.reporting.blocks import GraphBlock
 
 
-def create_node_graph_enrichment(params: ResourceGraphEnricherParams, node: Node):
+def create_node_graph_enrichment(params: ResourceGraphEnricherParams, node: Node,
+                                 metrics_legends_labels: Optional[List[str]] = None,) -> GraphBlock:
     start_at = datetime.now()
     labels = {"node": node.metadata.name}
     internal_ip = get_node_internal_ip(node)
@@ -20,5 +23,6 @@ def create_node_graph_enrichment(params: ResourceGraphEnricherParams, node: Node
         ResourceChartItemType.Node,
         prometheus_params=params,
         graph_duration_minutes=params.graph_duration_minutes,
+        metrics_legends_labels=metrics_legends_labels,
     )
     return graph_enrichment

{robusta_cli-0.10.27a2 → robusta_cli-0.10.28a0}/src/robusta/core/playbooks/oom_killer_utils.py

@@ -10,6 +10,7 @@ from robusta.api import (
     RegexReplacementStyle,
     RobustaPod,
 )
+from robusta.core.reporting.base import EnrichmentType
 
 
 def start_log_enrichment(
@@ -61,6 +62,8 @@ def start_log_enrichment(
         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"
         )
         break
 

{robusta_cli-0.10.27a2 → robusta_cli-0.10.28a0}/src/robusta/core/playbooks/pod_utils/imagepull_utils.py

@@ -40,6 +40,7 @@ def get_pod_issue_message_and_reason(pod: Pod) -> Tuple[Optional[str], Optional[
                 pod.status.containerStatuses[0].state.waiting.message,
                 reason,
             )
+    return None, None
 
 
 def decompose_flag(flag: Flag) -> List[Flag]: