paasta-tools 1.0.0__tar.gz → 1.0.2__tar.gz

{paasta-tools-1.0.0/paasta_tools.egg-info → paasta-tools-1.0.2}/PKG-INFO

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

{paasta-tools-1.0.0 → paasta-tools-1.0.2}/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__ = "1.0.0"
+__version__ = "1.0.2"

{paasta-tools-1.0.0 → paasta-tools-1.0.2}/paasta_tools/api/api.py

@@ -176,7 +176,6 @@ def make_app(global_config=None):
         request_method="GET",
     )
     config.add_route("version", "/v1/version")
-    config.add_route("metastatus", "/v1/metastatus")
     config.add_route("deploy_queue.list", "/v1/deploy_queue")
     config.scan()
     return CORS(

{paasta-tools-1.0.0 → paasta-tools-1.0.2}/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": {
@@ -1802,20 +1772,6 @@
                 }
             }
         },
-        "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-1.0.0 → paasta-tools-1.0.2}/paasta_tools/check_oom_events.py

@@ -28,7 +28,7 @@ from paasta_tools.utils import load_system_paasta_config
 
 try:
     from scribereader import scribereader
-    from clog.readers import StreamTailerSetupError
+    from scribereader.clog.readers import StreamTailerSetupError
 except ImportError:
     scribereader = None
 

{paasta-tools-1.0.0 → paasta-tools-1.0.2}/paasta_tools/cli/cli.py

@@ -101,7 +101,6 @@ def add_subparser(command, subparsers):
 
 PAASTA_SUBCOMMANDS = {
     "autoscale": "autoscale",
-    "boost": "boost",
     "check": "check",
     "cook-image": "cook_image",
     "get-docker-image": "get_docker_image",
@@ -116,7 +115,6 @@ PAASTA_SUBCOMMANDS = {
     "logs": "logs",
     "mark-for-deployment": "mark_for_deployment",
     "mesh-status": "mesh_status",
-    "metastatus": "metastatus",
     "pause_service_autoscaler": "pause_service_autoscaler",
     "push-to-registry": "push_to_registry",
     "remote-run": "remote_run",

{paasta-tools-1.0.0 → paasta-tools-1.0.2}/paasta_tools/cli/cmds/status.py

@@ -70,7 +70,6 @@ from paasta_tools.kubernetes_tools import format_tail_lines_for_kubernetes_pod
 from paasta_tools.kubernetes_tools import KubernetesDeploymentConfig
 from paasta_tools.kubernetes_tools import KubernetesDeployStatus
 from paasta_tools.kubernetes_tools import paasta_prefixed
-from paasta_tools.mesos_tools import format_tail_lines_for_mesos_task
 from paasta_tools.monitoring_tools import get_team
 from paasta_tools.monitoring_tools import list_teams
 from paasta_tools.paasta_service_config_loader import PaastaServiceConfigLoader
@@ -428,97 +427,6 @@ def create_autoscaling_info_table(autoscaling_info):
     return output
 
 
-def create_mesos_running_tasks_table(running_tasks):
-    rows = []
-    table_header = [
-        "Mesos Task ID",
-        "Host deployed to",
-        "Ram",
-        "CPU",
-        "Deployed at what localtime",
-    ]
-    rows.append(table_header)
-    for task in running_tasks or []:
-        mem_string = get_mesos_task_memory_string(task)
-        cpu_string = get_mesos_task_cpu_string(task)
-        deployed_at = datetime.fromtimestamp(task.deployed_timestamp)
-        deployed_at_string = "{} ({})".format(
-            deployed_at.strftime("%Y-%m-%dT%H:%M"), humanize.naturaltime(deployed_at)
-        )
-
-        rows.append(
-            [task.id, task.hostname, mem_string, cpu_string, deployed_at_string]
-        )
-        rows.extend(format_tail_lines_for_mesos_task(task.tail_lines, task.id))
-
-    return format_table(rows)
-
-
-def get_mesos_task_memory_string(task):
-    if task.rss.value is None or task.mem_limit.value is None:
-        return task.rss.error_message or task.mem_limit.error_message
-    elif task.mem_limit.value == 0:
-        return "Undef"
-    else:
-        mem_percent = 100 * task.rss.value / task.mem_limit.value
-        mem_string = "%d/%dMB" % (
-            (task.rss.value / 1024 / 1024),
-            (task.mem_limit.value / 1024 / 1024),
-        )
-        if mem_percent > 90:
-            return PaastaColors.red(mem_string)
-        else:
-            return mem_string
-
-
-def get_mesos_task_cpu_string(task):
-    if task.cpu_shares.value is None or task.cpu_used_seconds.value is None:
-        return task.cpu_shares.error_message
-    else:
-        # The total time a task has been allocated is the total time the task has
-        # been running multiplied by the "shares" a task has.
-        # (see https://github.com/mesosphere/mesos/blob/0b092b1b0/src/webui/master/static/js/controllers.js#L140)
-        allocated_seconds = task.cpu_shares.value * task.duration_seconds
-        if allocated_seconds == 0:
-            return "Undef"
-        else:
-            cpu_percent = round(
-                100 * (task.cpu_used_seconds.value / allocated_seconds), 1
-            )
-            cpu_string = "%s%%" % cpu_percent
-            if cpu_percent > 90:
-                return PaastaColors.red(cpu_string)
-            else:
-                return cpu_string
-
-
-def create_mesos_non_running_tasks_table(non_running_tasks):
-    rows = []
-    table_header = [
-        "Mesos Task ID",
-        "Host deployed to",
-        "Deployed at what localtime",
-        "Status",
-    ]
-    rows.append(table_header)
-
-    for task in non_running_tasks or []:
-        if task.deployed_timestamp is None:
-            deployed_at_string = "Unknown"
-        else:
-            deployed_at = datetime.fromtimestamp(task.deployed_timestamp)
-            deployed_at_string = "{} ({})".format(
-                deployed_at.strftime("%Y-%m-%dT%H:%M"),
-                humanize.naturaltime(deployed_at),
-            )
-
-        rows.append([task.id, task.hostname, deployed_at_string, task.state])
-        rows.extend(format_tail_lines_for_mesos_task(task.tail_lines, task.id))
-
-    table = format_table(rows)
-    return [PaastaColors.grey(formatted_row) for formatted_row in table]
-
-
 def format_kubernetes_pod_table(pods, verbose: int):
     rows: List[Union[tuple, str]] = [
         ("Pod ID", "Host deployed to", "Deployed at what localtime", "Health")

{paasta-tools-1.0.0 → paasta-tools-1.0.2}/paasta_tools/cli/utils.py

@@ -58,7 +58,6 @@ from paasta_tools.nrtsearchserviceeks_tools import (
 from paasta_tools.paasta_service_config_loader import PaastaServiceConfigLoader
 from paasta_tools.tron_tools import load_tron_instance_config
 from paasta_tools.utils import _log
-from paasta_tools.utils import _log_audit
 from paasta_tools.utils import _run
 from paasta_tools.utils import compose_job_id
 from paasta_tools.utils import DEFAULT_SOA_CONFIGS_GIT_URL
@@ -493,131 +492,6 @@ def check_ssh_on_master(master, timeout=10):
     return (False, output)
 
 
-def get_paasta_metastatus_cmd_args(
-    groupings: Sequence[str],
-    verbose: int = 0,
-    autoscaling_info: bool = False,
-    use_mesos_cache: bool = False,
-) -> Tuple[Sequence[str], int]:
-    if verbose > 0:
-        verbose_arg = ["-%s" % ("v" * verbose)]
-        timeout = 120
-    else:
-        verbose_arg = []
-        timeout = 20
-    autoscaling_arg = ["-a"] if autoscaling_info else []
-    if autoscaling_arg and verbose < 2:
-        verbose_arg = ["-vv"]
-    groupings_args = ["-g", *groupings] if groupings else []
-    cache_arg = ["--use-mesos-cache"] if use_mesos_cache else []
-    cmd_args = [*verbose_arg, *groupings_args, *autoscaling_arg, *cache_arg]
-    return cmd_args, timeout
-
-
-def run_paasta_metastatus(
-    master: str,
-    groupings: Sequence[str],
-    verbose: int = 0,
-    autoscaling_info: bool = False,
-    use_mesos_cache: bool = False,
-) -> Tuple[int, str]:
-    cmd_args, timeout = get_paasta_metastatus_cmd_args(
-        groupings=groupings,
-        verbose=verbose,
-        autoscaling_info=autoscaling_info,
-        use_mesos_cache=use_mesos_cache,
-    )
-    command = (
-        "ssh -A -n -o StrictHostKeyChecking=no {} sudo paasta_metastatus {}".format(
-            master, " ".join(cmd_args)
-        )
-    ).strip()
-    return_code, output = _run(command, timeout=timeout)
-    return return_code, output
-
-
-def run_paasta_cluster_boost(master, action, pool, duration, override, boost, verbose):
-    timeout = 20
-
-    verbose_flag: Optional[str]
-    if verbose > 0:
-        verbose_flag = "-{}".format("v" * verbose)
-    else:
-        verbose_flag = None
-
-    pool_flag = f"--pool {pool}"
-    duration_flag = f"--duration {duration}" if duration is not None else ""
-    boost_flag = f"--boost {boost}" if boost is not None else ""
-    override_flag = "--force" if override is not None else ""
-
-    cmd_args = " ".join(
-        filter(
-            None,
-            [action, pool_flag, duration_flag, boost_flag, override_flag, verbose_flag],
-        )
-    )
-    command = (
-        "ssh -A -n -o StrictHostKeyChecking=no {} paasta_cluster_boost {}".format(
-            master, cmd_args
-        )
-    ).strip()
-    return_code, output = _run(command, timeout=timeout)
-    return return_code, output
-
-
-def execute_paasta_cluster_boost_on_remote_master(
-    clusters,
-    system_paasta_config,
-    action,
-    pool,
-    duration=None,
-    override=None,
-    boost=None,
-    verbose=0,
-):
-    """Returns a string containing an error message if an error occurred.
-    Otherwise returns the output of run_paasta_cluster_boost().
-    """
-    result = {}
-    for cluster in clusters:
-        try:
-            master = connectable_master(cluster, system_paasta_config)
-        except NoMasterError as e:
-            result[cluster] = (255, str(e))
-            continue
-
-        result[cluster] = run_paasta_cluster_boost(
-            master=master,
-            action=action,
-            pool=pool,
-            duration=duration,
-            override=override,
-            boost=boost,
-            verbose=verbose,
-        )
-
-        audit_details = {
-            "boost_action": action,
-            "pool": pool,
-            "duration": duration,
-            "override": override,
-            "boost": boost,
-        }
-        _log_audit(
-            action="cluster-boost", action_details=audit_details, cluster=cluster
-        )
-
-    aggregated_code = 0
-    aggregated_output = ""
-    for cluster in result:
-        code = result[cluster][0]
-        output = result[cluster][1]
-        if not code == 0:
-            aggregated_code = 1
-        aggregated_output += f"\n{cluster}: \n{output}\n"
-    return (aggregated_code, aggregated_output)
-
-
 def run_on_master(
     cluster,
     system_paasta_config,

{paasta-tools-1.0.0 → paasta-tools-1.0.2}/paasta_tools/mesos_tools.py

@@ -153,14 +153,6 @@ def get_mesos_leader(mesos_config_path: Optional[str] = None) -> str:
         raise ValueError("Expected to receive a valid URL, got: %s" % url)
 
 
-def is_mesos_leader(hostname: str = MY_HOSTNAME) -> bool:
-    """Check if a hostname is the current mesos leader.
-
-    :param hostname: The hostname to query mesos-master on
-    :returns: True if hostname is the mesos-master leader, False otherwise"""
-    return get_mesos_leader() == hostname
-
-
 class MesosLeaderUnavailable(Exception):
     pass
 

{paasta-tools-1.0.0 → paasta-tools-1.0.2}/paasta_tools/metrics/metastatus_lib.py

@@ -18,7 +18,6 @@ import math
 import re
 from collections import Counter
 from collections import namedtuple
-from collections import OrderedDict
 from typing import Any
 from typing import Callable
 from typing import Mapping
@@ -474,60 +473,6 @@ def assert_kube_pods_running(
     )
 
 
-def assert_no_duplicate_frameworks(
-    state: MesosState, framework_list: Sequence[str]
-) -> HealthCheckResult:
-    """A function which asserts that there are no duplicate frameworks running, where
-    frameworks are identified by their name.
-
-    Note the extra spaces in the output strings: this is to account for the extra indentation
-    we add, so we can have:
-
-        frameworks:
-          framework: tron count: 1
-
-    :param state: the state info from the Mesos master
-    :returns: a tuple containing (output, ok): output is a log of the state of frameworks, ok a boolean
-        indicating if there are any duplicate frameworks.
-    """
-    output = ["Frameworks:"]
-    status = True
-    frameworks = state["frameworks"]
-    for name in framework_list:
-        shards = [x["name"] for x in frameworks if x["name"].startswith(name)]
-        for framework, count in OrderedDict(sorted(Counter(shards).items())).items():
-            if count > 1:
-                status = False
-                output.append(
-                    "    CRITICAL: There are %d connected %s frameworks! "
-                    "(Expected 1)" % (count, framework)
-                )
-        output.append("    Framework: %s count: %d" % (name, len(shards)))
-
-    return HealthCheckResult(message=("\n").join(output), healthy=status)
-
-
-def assert_frameworks_exist(
-    state: MesosState, expected: Sequence[str]
-) -> HealthCheckResult:
-    frameworks = [f["name"] for f in state["frameworks"]]
-    not_found = []
-    ok = True
-
-    for f in expected:
-        if f not in frameworks:
-            ok = False
-            not_found.append(f)
-
-    if ok:
-        return HealthCheckResult(message="all expected frameworks found", healthy=ok)
-    else:
-        return HealthCheckResult(
-            message="CRITICAL: framework(s) %s not found" % ", ".join(not_found),
-            healthy=ok,
-        )
-
-
 def get_mesos_slaves_health_status(
     metrics: MesosMetrics,
 ) -> Tuple[int, int]:

{paasta-tools-1.0.0 → paasta-tools-1.0.2}/paasta_tools/paastaapi/api/default_api.py

@@ -25,7 +25,6 @@ from paasta_tools.paastaapi.model_utils import (  # noqa: F401
 )
 from paasta_tools.paastaapi.model.deploy_queue import DeployQueue
 from paasta_tools.paastaapi.model.inline_object import InlineObject
-from paasta_tools.paastaapi.model.meta_status import MetaStatus
 
 
 class DefaultApi(object):
@@ -350,123 +349,6 @@ class DefaultApi(object):
             callable=__get_service_autoscaler_pause
         )
 
-        def __metastatus(
-            self,
-            cmd_args,
-            **kwargs
-        ):
-            """Get metastatus  # noqa: E501
-
-            This method makes a synchronous HTTP request by default. To make an
-            asynchronous HTTP request, please pass async_req=True
-
-            >>> thread = api.metastatus(cmd_args, async_req=True)
-            >>> result = thread.get()
-
-            Args:
-                cmd_args ([str]): comma separated list of command arguments
-
-            Keyword Args:
-                _return_http_data_only (bool): response data without head status
-                    code and headers. Default is True.
-                _preload_content (bool): if False, the urllib3.HTTPResponse object
-                    will be returned without reading/decoding response data.
-                    Default is True.
-                _request_timeout (float/tuple): timeout setting for this request. If one
-                    number provided, it will be total request timeout. It can also
-                    be a pair (tuple) of (connection, read) timeouts.
-                    Default is None.
-                _check_input_type (bool): specifies if type checking
-                    should be done one the data sent to the server.
-                    Default is True.
-                _check_return_type (bool): specifies if type checking
-                    should be done one the data received from the server.
-                    Default is True.
-                _host_index (int/None): specifies the index of the server
-                    that we want to use.
-                    Default is read from the configuration.
-                async_req (bool): execute request asynchronously
-
-            Returns:
-                MetaStatus
-                    If the method is called asynchronously, returns the request
-                    thread.
-            """
-            kwargs['async_req'] = kwargs.get(
-                'async_req', False
-            )
-            kwargs['_return_http_data_only'] = kwargs.get(
-                '_return_http_data_only', True
-            )
-            kwargs['_preload_content'] = kwargs.get(
-                '_preload_content', True
-            )
-            kwargs['_request_timeout'] = kwargs.get(
-                '_request_timeout', None
-            )
-            kwargs['_check_input_type'] = kwargs.get(
-                '_check_input_type', True
-            )
-            kwargs['_check_return_type'] = kwargs.get(
-                '_check_return_type', True
-            )
-            kwargs['_host_index'] = kwargs.get('_host_index')
-            kwargs['cmd_args'] = \
-                cmd_args
-            return self.call_with_http_info(**kwargs)
-
-        self.metastatus = Endpoint(
-            settings={
-                'response_type': (MetaStatus,),
-                'auth': [],
-                'endpoint_path': '/metastatus',
-                'operation_id': 'metastatus',
-                'http_method': 'GET',
-                'servers': None,
-            },
-            params_map={
-                'all': [
-                    'cmd_args',
-                ],
-                'required': [
-                    'cmd_args',
-                ],
-                'nullable': [
-                ],
-                'enum': [
-                ],
-                'validation': [
-                ]
-            },
-            root_map={
-                'validations': {
-                },
-                'allowed_values': {
-                },
-                'openapi_types': {
-                    'cmd_args':
-                        ([str],),
-                },
-                'attribute_map': {
-                    'cmd_args': 'cmd_args',
-                },
-                'location_map': {
-                    'cmd_args': 'query',
-                },
-                'collection_format_map': {
-                    'cmd_args': 'csv',
-                }
-            },
-            headers_map={
-                'accept': [
-                    'application/json'
-                ],
-                'content_type': [],
-            },
-            api_client=api_client,
-            callable=__metastatus
-        )
-
         def __show_version(
             self,
             **kwargs

{paasta-tools-1.0.0 → paasta-tools-1.0.2}/paasta_tools/paastaapi/models/__init__.py

@@ -49,7 +49,6 @@ from paasta_tools.paastaapi.model.kubernetes_pod_event import KubernetesPodEvent
 from paasta_tools.paastaapi.model.kubernetes_pod_v2 import KubernetesPodV2
 from paasta_tools.paastaapi.model.kubernetes_replica_set import KubernetesReplicaSet
 from paasta_tools.paastaapi.model.kubernetes_version import KubernetesVersion
-from paasta_tools.paastaapi.model.meta_status import MetaStatus
 from paasta_tools.paastaapi.model.resource import Resource
 from paasta_tools.paastaapi.model.resource_item import ResourceItem
 from paasta_tools.paastaapi.model.resource_value import ResourceValue