robusta-cli 1.1__tar.gz → 1.2__tar.gz

{robusta_cli-1.1 → robusta_cli-1.2}/PKG-INFO

@@ -1,31 +1,30 @@
 Metadata-Version: 2.1
 Name: robusta-cli
-Version: 1.1
+Version: 1.2
 Summary: 
 Author: Natan Yellin
 Author-email: aantn@users.noreply.github.com
-Requires-Python: >=3.9,<3.13
+Requires-Python: >=3.10,<3.13
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: certifi (==2024.7.4)
 Requires-Dist: click (==8.1.8)
 Requires-Dist: click-spinner (>=0.1.10,<0.2.0)
-Requires-Dist: cryptography (==43.0.1)
+Requires-Dist: cryptography (==46.0.5) ; python_full_version >= "3.9.2" and python_version < "3.13"
 Requires-Dist: dpath (>=2.0.5,<3.0.0)
 Requires-Dist: hikaru-model-28 (>=1.1.0,<2.0.0)
 Requires-Dist: kubernetes (>=29,<30)
 Requires-Dist: pydantic (>=1.0,<2.0)
-Requires-Dist: pyjwt (>=2.4.0,<3.0.0)
+Requires-Dist: pyjwt (>=2.12.0,<3.0.0)
 Requires-Dist: pyyaml (>=6.0.1,<7.0.0)
-Requires-Dist: requests (>=2.32.2,<3.0.0)
+Requires-Dist: requests (>=2.33.0,<3.0.0)
 Requires-Dist: slack-sdk (>=3,<4)
 Requires-Dist: toml (>=0.10.2,<0.11.0)
 Requires-Dist: typer (>=0.12.3,<0.13.0)
 Requires-Dist: types-toml (>=0.10.2,<0.11.0)
-Requires-Dist: urllib3 (>2.6.0)
+Requires-Dist: urllib3 (>=2.7.0)
 Description-Content-Type: text/markdown
 
 # robusta-cli

{robusta_cli-1.1 → robusta_cli-1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "robusta-cli"
-version = "1.1"
+version = "1.2"
 description = ""
 authors = ["Natan Yellin <aantn@users.noreply.github.com>"]
 readme = "README.md"
@@ -9,22 +9,22 @@ readme = "README.md"
 robusta = "robusta_cli.main:app"
 
 [tool.poetry.dependencies]
-python = "^3.9, <3.13"
+python = "^3.10, <3.13"
 typer = "^0.12.3"
 pyyaml = "^6.0.1"
 click-spinner = "^0.1.10"
-cryptography = "43.0.1"
+cryptography = {version = "46.0.5", python = ">=3.9.2,<3.13"}
 dpath = "^2.0.5"
 pydantic = "^1.0"
 slack-sdk = "^3"
-pyjwt = "^2.4.0"
-requests = "^2.32.2"
+pyjwt = "^2.12.0"
+requests = "^2.33.0"
 certifi = "2024.7.4"
 types-toml = "^0.10.2"
 toml = "^0.10.2"
 hikaru-model-28 = "^1.1.0"
 kubernetes = "^29"
-urllib3 = ">2.6.0"
+urllib3 = ">=2.7.0"
 click = "8.1.8"
 
 

{robusta_cli-1.1 → robusta_cli-1.2}/robusta_cli/_version.py

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

{robusta_cli-1.1 → robusta_cli-1.2}/robusta_cli/main.py

@@ -5,6 +5,7 @@ import subprocess
 import time
 import traceback
 import uuid
+from enum import Enum
 from typing import Dict, List, Optional, Union
 
 import certifi
@@ -61,6 +62,61 @@ app.add_typer(auth_commands, name="auth", help="Authentication commands menu")
 app.add_typer(self_host_commands, name="self-host", help="Self-host commands menu")
 
 
+class ClusterSize(str, Enum):
+    small = "small"
+    medium = "medium"
+    large = "large"
+
+# Resource configurations per cluster size (by CPU count):
+#   small:  < 16 CPUs
+#   medium: 16-128 CPUs
+#   large:  > 128 CPUs
+CLUSTER_SIZE_RESOURCES = {
+    "small": {
+        "kubewatch": {
+            "requests": {"memory": "128Mi", "cpu": "50m"},
+            "limits": {"memory": "128Mi"},
+        },
+        "runner": {
+            "requests": {"memory": "1Gi", "cpu": "100m"},
+            "limits": {"memory": "1536Mi"},
+        },
+        "holmes": {
+            "requests": {"memory": "1Gi", "cpu": "100m"},
+            "limits": {"memory": "1Gi"},
+        },
+    },
+    "medium": {
+        "kubewatch": {
+            "requests": {"memory": "256Mi", "cpu": "100m"},
+            "limits": {"memory": "256Mi"},
+        },
+        "runner": {
+            "requests": {"memory": "2Gi", "cpu": "500m"},
+            "limits": {"memory": "4Gi"},
+        },
+        "holmes": {
+            "requests": {"memory": "2Gi", "cpu": "250m"},
+            "limits": {"memory": "4Gi"},
+        },
+    },
+    "large": {
+        "kubewatch": {
+            "requests": {"memory": "1Gi", "cpu": "200m"},
+            "limits": {"memory": "1Gi"},
+        },
+        "runner": {
+            "requests": {"memory": "4Gi", "cpu": "1000m"},
+            "limits": {"memory": "6Gi"},
+        },
+        "holmes": {
+            "requests": {"memory": "2Gi", "cpu": "500m"},
+            "limits": {"memory": "4Gi"},
+        },
+    },
+}
+
+
 class GlobalConfig(BaseModel):
     signing_key: str = ""
     account_id: str = ""
@@ -68,6 +124,7 @@ class GlobalConfig(BaseModel):
 
 class HolmesConfig(BaseModel):
     additional_env_vars: List[Dict[str, str]]
+    resources: Optional[Dict] = None
 
 
 class HelmValues(BaseModel, extra=Extra.allow):
@@ -82,7 +139,7 @@ class HelmValues(BaseModel, extra=Extra.allow):
     kubewatch: Dict = None
     grafanaRenderer: Dict = None
     runner: Dict = None
-    enableHolmesGPT: Optional[bool] = None 
+    enableHolmesGPT: Optional[bool] = None
     holmes: Optional[HolmesConfig] = None
 
 
@@ -114,7 +171,11 @@ def gen_config(
     ),
     is_small_cluster: bool = typer.Option(
         None,
-        help="Local/Small cluster",
+        help="[Deprecated: use --cluster-size] Local/Small cluster",
+    ),
+    cluster_size: Optional[ClusterSize] = typer.Option(
+        None,
+        help="Cluster size: small (< 16 CPUs), medium (16-128 CPUs), large (> 128 CPUs)",
     ),
     slack_api_key: str = typer.Option(
         "",
@@ -248,7 +309,6 @@ def gen_config(
 
     values = HelmValues(
         clusterName=cluster_name,
-        isSmallCluster=is_small_cluster,
         globalConfig=GlobalConfig(signing_key=signing_key, account_id=account_id),
         sinksConfig=sinks_config,
         enablePrometheusStack=enable_prometheus_stack,
@@ -274,15 +334,12 @@ def gen_config(
                 "name": "ROBUSTA_TELEMETRY_ENDPOINT",
                 "value": backend_profile.robusta_telemetry_endpoint,
             },
+            {
+                "name": "ROBUSTA_API_ENDPOINT",
+                "value": backend_profile.robusta_cloud_api_host,
+            },
         ]
 
-    if is_small_cluster:
-        setattr(values, "kube-prometheus-stack", {})
-        kube_stack = getattr(values, "kube-prometheus-stack")
-        kube_stack["prometheus"] = {
-            "prometheusSpec": {"resources": {"requests": {"memory": "300Mi"}, "limits": {"memory": "300Mi"}}},
-        }
-
     if robusta_api_key:
         values.enableHolmesGPT = True
         values.holmes = HolmesConfig(additional_env_vars=[
@@ -292,6 +349,24 @@ def gen_config(
             }
         ])
 
+    # cluster_size (new) and is_small_cluster (legacy) are mutually exclusive
+    if cluster_size:
+        size_resources = CLUSTER_SIZE_RESOURCES.get(cluster_size.value)
+        if size_resources:
+            if "kubewatch" in size_resources:
+                values.kubewatch = {"resources": size_resources["kubewatch"]}
+            if "runner" in size_resources:
+                values.runner["resources"] = size_resources["runner"]
+            if "holmes" in size_resources and values.holmes:
+                values.holmes.resources = size_resources["holmes"]
+    elif is_small_cluster:
+        values.isSmallCluster = is_small_cluster
+        setattr(values, "kube-prometheus-stack", {})
+        kube_stack = getattr(values, "kube-prometheus-stack")
+        kube_stack["prometheus"] = {
+            "prometheusSpec": {"resources": {"requests": {"memory": "300Mi"}, "limits": {"memory": "300Mi"}}},
+        }
+
     write_values_file(output_path, values)
 
     if robusta_api_key: