paasta-tools 0.232.1__tar.gz → 1.0.1__tar.gz

{paasta-tools-0.232.1/paasta_tools.egg-info → paasta-tools-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: paasta-tools
-Version: 0.232.1
+Version: 1.0.1
 Summary: Tools for Yelps SOA infrastructure
 Home-page: UNKNOWN
 Author: Compute Infrastructure @ Yelp

{paasta-tools-0.232.1 → paasta-tools-1.0.1}/paasta_tools/__init__.py

@@ -17,4 +17,4 @@
 # setup phase, the dependencies may not exist on disk yet.
 #
 # Don't bump version manually. See `make release` docs in ./Makefile
-__version__ = "0.232.1"
+__version__ = "1.0.1"

{paasta-tools-0.232.1 → paasta-tools-1.0.1}/paasta_tools/api/api.py

@@ -30,7 +30,6 @@ from wsgicors import CORS
 
 import paasta_tools.api
 from paasta_tools import kubernetes_tools
-from paasta_tools import marathon_tools
 from paasta_tools.api import settings
 from paasta_tools.api.tweens import profiling
 from paasta_tools.api.tweens import request_logger
@@ -177,10 +176,6 @@ def make_app(global_config=None):
         request_method="GET",
     )
     config.add_route("version", "/v1/version")
-    config.add_route(
-        "marathon_dashboard", "/v1/marathon_dashboard", request_method="GET"
-    )
-    config.add_route("metastatus", "/v1/metastatus")
     config.add_route("deploy_queue.list", "/v1/deploy_queue")
     config.scan()
     return CORS(
@@ -219,17 +214,6 @@ def setup_paasta_api():
     else:
         settings.cluster = settings.system_paasta_config.get_cluster()
 
-    settings.marathon_clients = marathon_tools.get_marathon_clients(
-        marathon_tools.get_marathon_servers(settings.system_paasta_config)
-    )
-
-    settings.marathon_servers = marathon_tools.get_marathon_servers(
-        system_paasta_config=settings.system_paasta_config
-    )
-    settings.marathon_clients = marathon_tools.get_marathon_clients(
-        marathon_servers=settings.marathon_servers, cached=False
-    )
-
     try:
         settings.kubernetes_client = kubernetes_tools.KubeClient()
     except FileNotFoundError:

{paasta-tools-0.232.1 → paasta-tools-1.0.1}/paasta_tools/api/api_docs/swagger.json

@@ -35,36 +35,6 @@
                 "operationId": "showVersion"
             }
         },
-        "/metastatus": {
-            "get": {
-                "parameters": [
-                    {
-                        "in": "query",
-                        "description": "comma separated list of command arguments",
-                        "name": "cmd_args",
-                        "required": true,
-                        "type": "array",
-                        "collectionFormat": "csv",
-                        "items": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "Detailed metastatus",
-                        "schema": {
-                            "$ref": "#/definitions/MetaStatus"
-                        }
-                    },
-                    "500": {
-                        "description": "Metastatus failure"
-                    }
-                },
-                "summary": "Get metastatus",
-                "operationId": "metastatus"
-            }
-        },
         "/deploy_queue": {
             "get": {
                 "responses": {
@@ -309,23 +279,6 @@
                 "operationId": "delete_service_autoscaler_pause"
             }
         },
-        "/marathon_dashboard": {
-            "get": {
-                "responses": {
-                    "200": {
-                        "description": "List of service instances and information on their Marathon shard",
-                        "schema": {
-                            "$ref": "#/definitions/MarathonDashboard"
-                        }
-                    }
-                },
-                "summary": "Get marathon service instances and their shards",
-                "operationId": "marathon_dashboard",
-                "tags": [
-                    "marathon_dashboard"
-                ]
-            }
-        },
         "/resources/utilization": {
             "get": {
                 "responses": {
@@ -940,10 +893,6 @@
                     "type": "string",
                     "description": "Git sha of a service"
                 },
-                "marathon": {
-                    "$ref": "#/definitions/InstanceStatusMarathon",
-                    "description": "Marathon instance status"
-                },
                 "kubernetes": {
                     "$ref": "#/definitions/InstanceStatusKubernetes",
                     "description": "Kubernetes instance status"
@@ -1010,221 +959,6 @@
         "InstanceDelay": {
             "type": "object"
         },
-        "InstanceStatusMarathon": {
-            "type": "object",
-            "properties": {
-                "desired_state": {
-                    "type": "string",
-                    "description": "Desired state of a service, for Marathon",
-                    "enum": [
-                        "start",
-                        "stop"
-                    ]
-                },
-                "app_count": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "The number of different running versions of the same service (0 for stopped, 1 for running and 1+ for bouncing)"
-                },
-                "desired_app_id": {
-                    "type": "string",
-                    "description": "ID of the desired version of a service instance"
-                },
-                "bounce_method": {
-                    "type": "string",
-                    "description": "Method to transit between new and old versions of a service",
-                    "enum": [
-                        "brutal",
-                        "upthendown",
-                        "downthenup",
-                        "crossover"
-                    ]
-                },
-                "deploy_status": {
-                    "type": "string",
-                    "description": "Deploy status of a marathon service",
-                    "enum": [
-                        "Running",
-                        "Deploying",
-                        "Stopped",
-                        "Delayed",
-                        "Waiting",
-                        "Waiting for bounce",
-                        "NotRunning"
-                    ]
-                },
-                "backoff_seconds": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "backoff in seconds before launching the next task"
-                },
-                "running_instance_count": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "The number of actual running instances of the service"
-                },
-                "expected_instance_count": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "The number of desired instances of the service"
-                },
-                "autoscaling_info": {
-                    "$ref": "#/definitions/MarathonAutoscalingInfo",
-                    "description": "Autoscaling information for the service"
-                },
-                "app_statuses": {
-                    "type": "array",
-                    "description": "Statuses of each app of the service",
-                    "items": {
-                        "$ref": "#/definitions/MarathonAppStatus"
-                    }
-                },
-                "mesos": {
-                    "$ref": "#/definitions/MarathonMesosStatus",
-                    "description": "Status of the service in Mesos"
-                },
-                "smartstack": {
-                    "$ref": "#/definitions/SmartstackStatus",
-                    "description": "Status of the service in smartstack"
-                },
-                "envoy": {
-                    "$ref": "#/definitions/EnvoyStatus",
-                    "description": "Status of the service in Envoy"
-                },
-                "error_message": {
-                    "type": "string",
-                    "description": "Error message when a marathon job ID cannot be found"
-                },
-                "active_shas": {
-                    "type": "array",
-                    "description": "List of git/config SHAs running.",
-                    "items": {
-                        "type": "array",
-                        "items": {
-                            "type": "string",
-                            "x-nullable": true
-                        },
-                        "minItems": 2,
-                        "maxItems": 2
-                    }
-                },
-                "active_versions": {
-                    "type": "array",
-                    "description": "List of git SHA/image_version/config SHAs running.",
-                    "items": {
-                        "type": "array",
-                        "items": {
-                            "type": "string",
-                            "x-nullable": true
-                        },
-                        "minItems": 3,
-                        "maxItems": 3
-                    }
-                }
-            },
-            "required": [
-                "desired_state",
-                "app_count",
-                "bounce_method"
-            ]
-        },
-        "MarathonMesosStatus": {
-            "type": "object",
-            "properties": {
-                "running_task_count": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "The number of running Mesos tasks associated to this service"
-                },
-                "running_tasks": {
-                    "type": "array",
-                    "description": "Currently running tasks associated to this service",
-                    "items": {
-                        "$ref": "#/definitions/MarathonMesosRunningTask"
-                    }
-                },
-                "non_running_tasks": {
-                    "type": "array",
-                    "description": "Non-running tasks associated to this service",
-                    "items": {
-                        "$ref": "#/definitions/MarathonMesosNonrunningTask"
-                    }
-                },
-                "error_message": {
-                    "type": "string",
-                    "description": "Error message when Mesos tasks cannot be queried"
-                }
-            }
-        },
-        "MarathonMesosRunningTask": {
-            "type": "object",
-            "properties": {
-                "id": {
-                    "type": "string",
-                    "description": "The ID of the task in Mesos"
-                },
-                "hostname": {
-                    "type": "string",
-                    "description": "Name of the Mesos agent on which this task is running"
-                },
-                "mem_limit": {
-                    "$ref": "#/definitions/IntegerAndError",
-                    "description": "The maximum amount of memory the task is allowed to use"
-                },
-                "rss": {
-                    "$ref": "#/definitions/IntegerAndError",
-                    "description": "The tasks's resident set size"
-                },
-                "cpu_shares": {
-                    "$ref": "#/definitions/FloatAndError",
-                    "description": "The portion of a CPU that the task can use"
-                },
-                "cpu_used_seconds": {
-                    "$ref": "#/definitions/FloatAndError",
-                    "description": "The number of seconds of CPU time the task has used"
-                },
-                "duration_seconds": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "The duration over which the task has been running in seconds"
-                },
-                "deployed_timestamp": {
-                    "type": "number",
-                    "format": "float",
-                    "description": "The unix timestamp at which the task was deployed"
-                },
-                "tail_lines": {
-                    "$ref": "#/definitions/TaskTailLines",
-                    "description": "Stdout and stderr tail of the task"
-                }
-            }
-        },
-        "MarathonMesosNonrunningTask": {
-            "type": "object",
-            "properties": {
-                "id": {
-                    "type": "string",
-                    "description": "The ID of the task in Mesos"
-                },
-                "hostname": {
-                    "type": "string",
-                    "description": "Name of the Mesos agent on which this task is running"
-                },
-                "deployed_timestamp": {
-                    "type": "number",
-                    "format": "float",
-                    "description": "The unix timestamp at which the task was deployed"
-                },
-                "state": {
-                    "type": "string",
-                    "description": "The current state of the task"
-                },
-                "tail_lines": {
-                    "$ref": "#/definitions/TaskTailLines",
-                    "description": "Stdout and stderr tail of the task"
-                }
-            }
-        },
         "TaskTailLines": {
             "type": "object",
             "properties": {
@@ -1248,117 +982,6 @@
                 }
             }
         },
-        "MarathonAutoscalingInfo": {
-            "type": "object",
-            "properties": {
-                "current_instances": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "The number of instances of the service currently running"
-                },
-                "max_instances": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "The maximum number of instances that the autoscaler will scale to"
-                },
-                "min_instances": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "The minimum number of instances that the autoscaler will scale to"
-                },
-                "current_utilization": {
-                    "type": "number",
-                    "format": "float",
-                    "description": "The current utilization of the instances' allocated resources"
-                },
-                "target_instances": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "The autoscaler's current target number of instances of this service to run"
-                }
-            }
-        },
-        "MarathonAppStatus": {
-            "type": "object",
-            "properties": {
-                "tasks_running": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "Number running tasks for this app"
-                },
-                "tasks_healthy": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "Number of healthy tasks for this app"
-                },
-                "tasks_staged": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "Number of staged tasks for this app"
-                },
-                "tasks_total": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "Total number of tasks for this app"
-                },
-                "create_timestamp": {
-                    "type": "number",
-                    "format": "float",
-                    "description": "Unix timestamp when this app was created"
-                },
-                "deploy_status": {
-                    "type": "string",
-                    "description": "Deploy status of this app"
-                },
-                "dashboard_url": {
-                    "type": "string",
-                    "description": "Marathon dashboard URL for this app"
-                },
-                "backoff_seconds": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "Backoff in seconds before launching next task"
-                },
-                "unused_offer_reason_counts": {
-                    "type": "object",
-                    "description": "Mapping of reason offer was refused to the number of times that type of refusal was seen"
-                },
-                "tasks": {
-                    "type": "array",
-                    "description": "Tasks associated to this app",
-                    "items": {
-                        "$ref": "#/definitions/MarathonTask"
-                    }
-                }
-            }
-        },
-        "MarathonTask": {
-            "type": "object",
-            "properties": {
-                "id": {
-                    "type": "string",
-                    "description": "ID of the task in Mesos"
-                },
-                "host": {
-                    "type": "string",
-                    "description": "Name of the host on which the task is running"
-                },
-                "port": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "Port on which the task is listening"
-                },
-                "deployed_timestamp": {
-                    "type": "number",
-                    "format": "float",
-                    "description": "Time at which the task was deployed"
-                },
-                "is_healthy": {
-                    "type": "boolean",
-                    "description": "Whether Marathon thinks the task is healthy"
-                }
-            }
-        },
         "SmartstackStatus": {
             "type": "object",
             "properties": {
@@ -2149,52 +1772,6 @@
                 }
             }
         },
-        "MarathonDashboard": {
-            "type": "object",
-            "description": "A list of Marathon service, instance, and shard url for one or more clusters",
-            "additionalProperties": {
-                "$ref": "#/definitions/MarathonDashboardCluster"
-            }
-        },
-        "MarathonDashboardCluster": {
-            "type": "array",
-            "description": "List of all the MarathonDashboardItems for a cluster",
-            "items": {
-                "$ref": "#/definitions/MarathonDashboardItem"
-            }
-        },
-        "MarathonDashboardItem": {
-            "type": "object",
-            "description": "Marathon service, instance, and shard url",
-            "properties": {
-                "service": {
-                    "type": "string",
-                    "description": "Service name"
-                },
-                "instance": {
-                    "type": "string",
-                    "description": "Instance name"
-                },
-                "shard_url": {
-                    "type": "string",
-                    "description": "Marathon Shard URL"
-                }
-            }
-        },
-        "MetaStatus": {
-            "type": "object",
-            "description": "Result of `paasta metastatus` command",
-            "properties": {
-                "output": {
-                    "type": "string",
-                    "description": "Output from `paasta metastatus` command"
-                },
-                "exit_code": {
-                    "type": "integer",
-                    "description": "Exit code from `paasta metastatus` command"
-                }
-            }
-        },
         "DeployQueue": {
             "type": "object",
             "description": "Current state of the deployd queue",

{paasta-tools-0.232.1 → paasta-tools-1.0.1}/paasta_tools/api/client.py

@@ -35,7 +35,6 @@ log = logging.getLogger(__name__)
 class PaastaOApiClient:
     autoscaler: paastaapis.AutoscalerApi
     default: paastaapis.DefaultApi
-    marathon_dashboard: paastaapis.MarathonDashboardApi
     resources: paastaapis.ResourcesApi
     service: paastaapis.ServiceApi
     api_error: Type[paastaapi.ApiException]
@@ -67,7 +66,6 @@ def get_paasta_oapi_client_by_url(
     return PaastaOApiClient(
         autoscaler=paastaapis.AutoscalerApi(client),
         default=paastaapis.DefaultApi(client),
-        marathon_dashboard=paastaapis.MarathonDashboardApi(client),
         resources=paastaapis.ResourcesApi(client),
         service=paastaapis.ServiceApi(client),
         api_error=paastaapi.ApiException,

{paasta-tools-0.232.1 → paasta-tools-1.0.1}/paasta_tools/api/settings.py

@@ -19,7 +19,6 @@ from typing import Optional
 
 from paasta_tools import utils
 from paasta_tools.kubernetes_tools import KubeClient
-from paasta_tools.marathon_tools import MarathonClients
 from paasta_tools.utils import DEFAULT_SOA_DIR
 from paasta_tools.utils import SystemPaastaConfig
 
@@ -30,6 +29,5 @@ soa_dir: str = os.environ.get("PAASTA_API_SOA_DIR", DEFAULT_SOA_DIR)
 # of the corresponding type after the application is started.
 cluster: str = None  # type: ignore
 hostname: str = utils.get_hostname()
-marathon_clients: MarathonClients = None  # type: ignore
 kubernetes_client: Optional[KubeClient] = None
 system_paasta_config: Optional[SystemPaastaConfig]

{paasta-tools-0.232.1 → paasta-tools-1.0.1}/paasta_tools/api/views/autoscaler.py

@@ -22,7 +22,6 @@ from paasta_tools.api import settings
 from paasta_tools.api.views.exception import ApiFailure
 from paasta_tools.cli.utils import get_instance_config
 from paasta_tools.kubernetes_tools import KubernetesDeploymentConfig
-from paasta_tools.marathon_tools import MarathonServiceConfig
 
 
 @view_config(route_name="service.autoscaler.get", request_method="GET", renderer="json")
@@ -33,12 +32,10 @@ def get_autoscaler_count(request):
     soa_dir = settings.soa_dir
 
     instance_config = get_instance_config(service, instance, cluster, soa_dir)
-    if not isinstance(
-        instance_config, (KubernetesDeploymentConfig, MarathonServiceConfig)
-    ):
+    if not isinstance(instance_config, (KubernetesDeploymentConfig)):
         error_message = (
             f"Autoscaling is not supported for {service}.{instance} because instance type is not "
-            f"marathon or kubernetes."
+            f"kubernetes."
         )
         raise ApiFailure(error_message, 501)
 
@@ -65,12 +62,10 @@ def update_autoscaler_count(request):
         raise ApiFailure(error_message, 500)
 
     instance_config = get_instance_config(service, instance, cluster, soa_dir, True)
-    if not isinstance(
-        instance_config, (KubernetesDeploymentConfig, MarathonServiceConfig)
-    ):
+    if not isinstance(instance_config, (KubernetesDeploymentConfig)):
         error_message = (
             f"Autoscaling is not supported for {service}.{instance} because instance type is not "
-            f"marathon or kubernetes."
+            f"kubernetes."
         )
         raise ApiFailure(error_message, 501)