kaqing 2.0.74__tar.gz → 2.0.76__tar.gz

{kaqing-2.0.74 → kaqing-2.0.76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaqing
-Version: 2.0.74
+Version: 2.0.76
 Summary: UNKNOWN
 Home-page: UNKNOWN
 License: UNKNOWN

{kaqing-2.0.74 → kaqing-2.0.76}/adam/commands/command.py

@@ -2,7 +2,6 @@ from abc import abstractmethod
 import copy
 import subprocess
 import sys
-from typing import Callable
 
 from adam.commands.command_helpers import ClusterCommandHelper
 from adam.repl_state import ReplState, RequiredState

kaqing-2.0.76/adam/embedded_params.py

@@ -0,0 +1,2 @@
+def config():
+    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'audit': {'endpoint': 'https://sex7je4h2e.execute-api.us-west-2.amazonaws.com/prod', 'workers': 3, 'timeout': 10}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}, 'alter-tables': {'excludes': 'system_auth,system_traces,reaper_db,system_distributed,system_views,system,system_schema,system_virtual_schema', 'gc-grace-periods': '3600,86400,864000,7776000', 'batching': True}}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://c3energy.okta.com/oauth2/v1/keys'}}, 'issues': {'workers': 32}, 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'medusa': {'restore-auto-complete': False}, 'nodetool': {'workers': 32, 'samples': 3, 'commands_in_line': 40}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'name': 'ops-pg-agent', 'just-in-time': False, 'timeout': 86400, 'image': 'seanahnsf/kaqing'}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'pod': {'name': 'ops', 'image': 'seanahnsf/kaqing-cloud', 'sa': {'name': 'ops', 'proto': 'c3', 'additional-cluster-roles': 'c3aiops-k8ssandra-operator'}, 'label-selector': 'run=ops'}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,CPU,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.14', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'a', 'auto-enter-app': 'c3/c3', 'auto-enter-only-cluster': True}, 'status': {'columns': 'status,address,load,tokens,owns,host_id,gossip,compactions', 'header': '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS'}, 'storage': {'columns': 'pod,volume_root,volume_cassandra,snapshots,data,compactions', 'header': 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS'}, 'watch': {'auto': 'rollout', 'timeout': 3600, 'interval': 10}, 'debug': False, 'debugs': {'timings': False, 'exit-on-error': False, 'show-parallelism': False}}

{kaqing-2.0.74 → kaqing-2.0.76}/adam/repl.py

@@ -1,10 +1,13 @@
+import getpass
 import os
 import re
 import time
 import traceback
 import click
+import concurrent
 from prompt_toolkit.completion import NestedCompleter
 from prompt_toolkit.key_binding import KeyBindings
+import requests
 
 from adam.cli_group import cli
 from adam.commands.command import Command
@@ -92,73 +95,87 @@ def enter_repl(state: ReplState):
     def _(event):
         event.app.current_buffer.text = ''
 
-    # use sorted command list only for auto-completion
-    sorted_cmds = sorted(cmd_list, key=lambda cmd: cmd.command())
-    while True:
-        try:
-            completer = NestedCompleter.from_nested_dict({})
-            if not state.bash_session:
-                completions = {}
-                # app commands are available only on a: drive
-                if state.device == ReplState.A and state.app_app:
-                    completions = Apps(path='apps.yaml').commands()
-
-                for cmd in sorted_cmds:
-                    s1 = time.time()
-                    try:
-                        completions = deep_sort_dict(deep_merge_dicts(completions, cmd.completion(state)))
-                    finally:
-                        if Config().get('debugs.timings', False):
-                            log2(f'Timing auto-completion-calc {cmd.command()}: {time.time() - s1:.2f}')
-
-                # print(json.dumps(completions, indent=4))
-                completer = NestedCompleter.from_nested_dict(completions)
-
-            cmd = session.prompt(prompt_msg(), completer=completer, key_bindings=kb)
-            s0 = time.time()
-
-            if state.bash_session:
-                if cmd.strip(' ') == 'exit':
-                    state.exit_bash()
-                    continue
-
-                cmd = f'bash {cmd}'
-
-            if cmd and cmd.strip(' ') and not cmds.run(cmd, state):
-                c_sql_tried = False
-                if state.device == ReplState.P:
-                    pg = PostgresSession(state.namespace, state.pg_path)
-                    if pg.db:
+    with concurrent.futures.ThreadPoolExecutor(max_workers=Config().get('audit.workers', 3)) as executor:
+        # use sorted command list only for auto-completion
+        sorted_cmds = sorted(cmd_list, key=lambda cmd: cmd.command())
+        while True:
+            try:
+                completer = NestedCompleter.from_nested_dict({})
+                if not state.bash_session:
+                    completions = {}
+                    # app commands are available only on a: drive
+                    if state.device == ReplState.A and state.app_app:
+                        completions = Apps(path='apps.yaml').commands()
+
+                    for cmd in sorted_cmds:
+                        s1 = time.time()
+                        try:
+                            completions = deep_sort_dict(deep_merge_dicts(completions, cmd.completion(state)))
+                        finally:
+                            if Config().get('debugs.timings', False):
+                                log2(f'Timing auto-completion-calc {cmd.command()}: {time.time() - s1:.2f}')
+
+                    # print(json.dumps(completions, indent=4))
+                    completer = NestedCompleter.from_nested_dict(completions)
+
+                cmd = session.prompt(prompt_msg(), completer=completer, key_bindings=kb)
+                s0 = time.time()
+
+                if state.bash_session:
+                    if cmd.strip(' ') == 'exit':
+                        state.exit_bash()
+                        continue
+
+                    cmd = f'bash {cmd}'
+
+                if cmd and cmd.strip(' ') and not cmds.run(cmd, state):
+                    c_sql_tried = False
+                    if state.device == ReplState.P:
+                        pg = PostgresSession(state.namespace, state.pg_path)
+                        if pg.db:
+                            c_sql_tried = True
+                            cmd = f'pg {cmd}'
+                            cmds.run(cmd, state)
+                    elif state.device == ReplState.A:
+                        if state.app_app:
+                            c_sql_tried = True
+                            cmd = f'app {cmd}'
+                            cmds.run(cmd, state)
+                    elif state.sts:
                         c_sql_tried = True
-                        cmd = f'pg {cmd}'
+                        cmd = f'cql {cmd}'
                         cmds.run(cmd, state)
-                elif state.device == ReplState.A:
-                    if state.app_app:
-                        c_sql_tried = True
-                        cmd = f'app {cmd}'
-                        cmds.run(cmd, state)
-                elif state.sts:
-                    c_sql_tried = True
-                    cmd = f'cql {cmd}'
-                    cmds.run(cmd, state)
-
-                if not c_sql_tried:
-                    log2(f'* Invalid command: {cmd}')
-                    log2()
-                    lines = [c.help(state) for c in cmd_list if c.help(state)]
-                    log2(lines_to_tabular(lines, separator='\t'))
-        except EOFError:  # Handle Ctrl+D (EOF) for graceful exit
-            break
-        except Exception as e:
-            if Config().get('debugs.exit-on-error', False):
-                raise e
-            else:
-                log2(e)
-                Config().debug(traceback.format_exc())
-        finally:
-            Config().clear_wait_log_flag()
-            if Config().get('debugs.timings', False) and 'cmd' in locals() and 's0' in locals():
-                log2(f'Timing command {cmd}: {time.time() - s0:.2f}')
+
+                    if not c_sql_tried:
+                        log2(f'* Invalid command: {cmd}')
+                        log2()
+                        lines = [c.help(state) for c in cmd_list if c.help(state)]
+                        log2(lines_to_tabular(lines, separator='\t'))
+            except EOFError:  # Handle Ctrl+D (EOF) for graceful exit
+                break
+            except Exception as e:
+                if Config().get('debugs.exit-on-error', False):
+                    raise e
+                else:
+                    log2(e)
+                    Config().debug(traceback.format_exc())
+            finally:
+                Config().clear_wait_log_flag()
+                if Config().get('debugs.timings', False) and 'cmd' in locals() and 's0' in locals():
+                    log2(f'Timing command {cmd}: {time.time() - s0:.2f}')
+
+                # offload audit logging
+                if cmd:
+                    executor.submit(audit_log, cmd, state)
+
+def audit_log(cmd: str, state: ReplState):
+    payload = {"line": cmd, "ts": time.time(), "cluster": state.namespace if state.namespace else 'NA', "user": getpass.getuser()}
+    audit_endpoint = Config().get("audit.endpoint", "https://sex7je4h2e.execute-api.us-west-2.amazonaws.com/prod")
+    response = requests.post(audit_endpoint, json=payload, timeout=Config().get("audit.timeout", 10))
+    if response.status_code in [200, 201]:
+        Config().debug(response.text)
+    else:
+        log2(f"Error: {response.status_code} {response.text}")
 
 @cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=ClusterCommandHelper, help="Enter interactive shell.")
 @click.option('--kubeconfig', '-k', required=False, metavar='path', help='path to kubeconfig file')

{kaqing-2.0.74 → kaqing-2.0.76}/adam/utils.py

@@ -9,7 +9,6 @@ import os
 from pathlib import Path
 import random
 import string
-from typing import cast
 from dateutil import parser
 import subprocess
 import sys

kaqing-2.0.76/adam/version.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+__version__ = "2.0.76"  #: the working version
+__release__ = "1.0.0"  #: the release version

{kaqing-2.0.74 → kaqing-2.0.76}/kaqing.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaqing
-Version: 2.0.74
+Version: 2.0.76
 Summary: UNKNOWN
 Home-page: UNKNOWN
 License: UNKNOWN

{kaqing-2.0.74 → kaqing-2.0.76}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='kaqing',
-    version='2.0.74',
+    version='2.0.76',
     packages=find_packages(),
     entry_points={
         'console_scripts': [

kaqing-2.0.74/adam/embedded_params.py

@@ -1,2 +0,0 @@
-def config():
-    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}, 'alter-tables': {'excludes': 'system_auth,system_traces,reaper_db,system_distributed,system_views,system,system_schema,system_virtual_schema', 'gc-grace-periods': '3600,86400,864000,7776000', 'batching': True}}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://c3energy.okta.com/oauth2/v1/keys'}}, 'issues': {'workers': 32}, 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'medusa': {'restore-auto-complete': False}, 'nodetool': {'workers': 32, 'samples': 3, 'commands_in_line': 40}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'name': 'ops-pg-agent', 'just-in-time': False, 'timeout': 86400, 'image': 'seanahnsf/kaqing'}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'pod': {'name': 'ops', 'image': 'seanahnsf/kaqing-cloud', 'sa': {'name': 'ops', 'proto': 'c3', 'additional-cluster-roles': 'c3aiops-k8ssandra-operator'}, 'label-selector': 'run=ops'}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,CPU,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.14', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'a', 'auto-enter-app': 'c3/c3', 'auto-enter-only-cluster': True}, 'status': {'columns': 'status,address,load,tokens,owns,host_id,gossip,compactions', 'header': '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS'}, 'storage': {'columns': 'pod,volume_root,volume_cassandra,snapshots,data,compactions', 'header': 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS'}, 'watch': {'auto': 'rollout', 'timeout': 3600, 'interval': 10}, 'debug': False, 'debugs': {'timings': False, 'exit-on-error': False, 'show-parallelism': False}}

kaqing-2.0.74/adam/version.py

@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-__version__ = "2.0.74"  #: the working version
-__release__ = "1.0.0"  #: the release version