kaqing 2.0.104__tar.gz → 2.0.106__tar.gz

{kaqing-2.0.104 → kaqing-2.0.106}/PKG-INFO

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

{kaqing-2.0.104 → kaqing-2.0.106}/adam/commands/audit/audit.py

@@ -2,12 +2,15 @@ import click
 
 from adam.commands.audit.audit_repair_tables import AuditRepairTables
 from adam.commands.audit.audit_run import AuditRun
+from adam.commands.audit.show_last10 import ShowLast10
+from adam.commands.audit.show_slow10 import ShowSlow10
+from adam.commands.audit.show_top10 import ShowTop10
 from adam.commands.command import Command
 from adam.config import Config
 from adam.repl_state import ReplState
 from adam.sql.sql_completer import SqlCompleter
 from adam.utils import log2
-from adam.utils_athena import audit_column_names, audit_table_names, run_audit_query
+from adam.utils_audits import Audits
 
 class Audit(Command):
     COMMAND = 'audit'
@@ -42,7 +45,7 @@ class Audit(Command):
             else:
                 log2(sql)
 
-            run_audit_query(sql)
+            Audits.run_audit_query(sql)
 
         return state
 
@@ -52,23 +55,23 @@ class Audit(Command):
                 Config().wait_log(f'Inspecting audit database schema...')
                 self.schema_read = True
                 # warm up the caches first time when l: drive is accessed
-                audit_column_names()
-                audit_column_names(partition_cols_only=True)
+                Audits.audit_column_names()
+                Audits.audit_column_names(partition_cols_only=True)
 
             return super().completion(state) | SqlCompleter(
-                lambda: audit_table_names(),
-                columns=lambda table: audit_column_names(),
-                partition_columns=lambda table: audit_column_names(partition_cols_only=True),
+                lambda: Audits.audit_table_names(),
+                columns=lambda table: Audits.audit_column_names(),
+                partition_columns=lambda table: Audits.audit_column_names(partition_cols_only=True),
                 variant='athena'
             ).completions_for_nesting()
 
         return {}
 
     def cmd_list():
-        return [AuditRepairTables(), AuditRun()]
+        return [AuditRepairTables(), AuditRun(), ShowLast10(), ShowSlow10(), ShowTop10()]
 
     def help(self, _: ReplState):
-        return f'[{Audit.COMMAND}] <sql-statements>\t run SQL queries on Authena audit database'
+        return f'[{Audit.COMMAND}] [<sql-statements>]\t run SQL queries on Authena audit database'
 
 class AuditCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):

{kaqing-2.0.104 → kaqing-2.0.106}/adam/commands/audit/audit_repair_tables.py

@@ -1,12 +1,11 @@
 import concurrent
 import time
-import requests
 
 from adam.commands.command import Command
 from adam.config import Config
 from adam.repl_state import ReplState
 from adam.utils import log, log2
-from adam.utils_athena import AuditMeta, audit_query, get_meta, put_meta, run_audit_query
+from adam.utils_audits import AuditMeta, Audits
 
 class AuditRepairTables(Command):
     COMMAND = 'audit repair'
@@ -34,7 +33,7 @@ class AuditRepairTables(Command):
         if args:
             tables = args
 
-        meta = get_meta()
+        meta = Audits.get_meta()
         self.repair(tables, meta)
 
         return state
@@ -53,8 +52,8 @@ class AuditRepairTables(Command):
     def auto_repair(self, hours: int):
         self.auto_repaired = True
 
-        meta = get_meta()
-        if meta.checked_in + hours * 60 * 60 < time.time():
+        meta: AuditMeta = Audits.get_meta()
+        if meta.partitions_last_checked + hours * 60 * 60 < time.time():
             tables = Config().get('audit.athena.repair-partition-tables', 'audit').split(',')
             self.repair(tables, meta, show_sql=True)
             log2(f'Audit tables have been auto-repaired.')
@@ -65,8 +64,8 @@ class AuditRepairTables(Command):
                 if show_sql:
                     log(f'MSCK REPAIR TABLE {table}')
 
-                executor.submit(run_audit_query, f'MSCK REPAIR TABLE {table}', None,)
-            executor.submit(put_meta, 'check-in', meta,)
+                executor.submit(Audits.run_audit_query, f'MSCK REPAIR TABLE {table}', None,)
+            executor.submit(Audits.put_meta, Audits.PARTITIONS_ADDED, meta,)
 
     def help(self, _: ReplState):
         return f"{AuditRepairTables.COMMAND} \t run MSCK REPAIR command for new partition discovery"

{kaqing-2.0.104 → kaqing-2.0.106}/adam/commands/audit/audit_run.py

@@ -1,8 +1,10 @@
+import concurrent
+
 from adam.commands.command import Command
 from adam.config import Config
 from adam.repl_state import ReplState
 from adam.utils import log2
-from adam.utils_athena import AuditMeta, find_new_clusters, get_meta, put_meta, run_audit_query
+from adam.utils_audits import AuditMeta, Audits
 
 class AuditRun(Command):
     COMMAND = 'audit run'
@@ -26,14 +28,15 @@ class AuditRun(Command):
 
         state, args = self.apply_state(args, state)
 
-        meta: AuditMeta = get_meta()
-        clusters = find_new_clusters(meta.cluster_last_checked)
+        meta: AuditMeta = Audits.get_meta()
+        clusters = Audits.find_new_clusters(meta.cluster_last_checked)
+        Audits.put_meta(Audits.ADD_CLUSTERS, meta, clusters=clusters)
         if clusters:
-            put_meta('add-clusters', meta, clusters=clusters)
             log2(f'Added {len(clusters)} new clusters.')
             tables = Config().get('audit.athena.repair-cluster-tables', 'cluster').split(',')
-            for table in tables:
-                run_audit_query(f'MSCK REPAIR TABLE {table}')
+            with concurrent.futures.ThreadPoolExecutor(max_workers=Config().get('audit.workers', 3)) as executor:
+                for table in tables:
+                    executor.submit(Audits.run_audit_query, f'MSCK REPAIR TABLE {table}', None,)
         else:
             log2(f'No new clusters were found.')
 

kaqing-2.0.106/adam/commands/audit/show_last10.py

@@ -0,0 +1,52 @@
+from datetime import datetime, timedelta
+
+from adam.commands.command import Command
+from adam.repl_state import ReplState
+from adam.utils import log2
+from adam.utils_audits import Audits
+
+class ShowLast10(Command):
+    COMMAND = 'show last'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(ShowLast10, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return ShowLast10.COMMAND
+
+    def run(self, cmd: str, state: ReplState):
+        if not(args := self.args(cmd)):
+            return super().run(cmd, state)
+
+        state, args = self.apply_state(args, state)
+        limit = 10
+        if args:
+            try:
+                limit = int(args[0])
+            except:
+                pass
+
+        query = '\n    '.join([
+            "SELECT * FROM audit",
+            f"WHERE drive <> 'z' and ({Audits.date_from(datetime.now() - timedelta(days=30))})",
+            f"ORDER BY ts DESC LIMIT {limit};"])
+        log2(query)
+        log2()
+        Audits.run_audit_query(query)
+
+        return state
+
+    def completion(self, state: ReplState):
+        if state.device == ReplState.L:
+            return super().completion(state, {'10': None})
+
+        return {}
+
+    def help(self, _: ReplState):
+        return f'{ShowLast10.COMMAND} [limit]\t show last <limit> audit lines'

kaqing-2.0.106/adam/commands/audit/show_slow10.py

@@ -0,0 +1,52 @@
+from datetime import datetime, timedelta
+
+from adam.commands.command import Command
+from adam.repl_state import ReplState
+from adam.utils import log2
+from adam.utils_audits import Audits
+
+class ShowSlow10(Command):
+    COMMAND = 'show slow'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(ShowSlow10, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return ShowSlow10.COMMAND
+
+    def run(self, cmd: str, state: ReplState):
+        if not(args := self.args(cmd)):
+            return super().run(cmd, state)
+
+        state, args = self.apply_state(args, state)
+        limit = 10
+        if args:
+            try:
+                limit = int(args[0])
+            except:
+                pass
+
+        query = '\n    '.join([
+            "SELECT * FROM audit",
+            f"WHERE drive <> 'z' and ({Audits.date_from(datetime.now() - timedelta(days=30))})",
+            f"ORDER BY CAST(duration AS REAL) DESC LIMIT {limit};"])
+        log2(query)
+        log2()
+        Audits.run_audit_query(query)
+
+        return state
+
+    def completion(self, state: ReplState):
+        if state.device == ReplState.L:
+            return super().completion(state, {'10': None})
+
+        return {}
+
+    def help(self, _: ReplState):
+        return f'{ShowSlow10.COMMAND} [limit]\t show slow <limit> audit lines'

kaqing-2.0.106/adam/commands/audit/show_top10.py

@@ -0,0 +1,52 @@
+from datetime import datetime, timedelta
+
+from adam.commands.command import Command
+from adam.repl_state import ReplState
+from adam.utils import log2
+from adam.utils_audits import Audits
+
+class ShowTop10(Command):
+    COMMAND = 'show top'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(ShowTop10, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return ShowTop10.COMMAND
+
+    def run(self, cmd: str, state: ReplState):
+        if not(args := self.args(cmd)):
+            return super().run(cmd, state)
+
+        state, args = self.apply_state(args, state)
+        limit = 10
+        if args:
+            try:
+                limit = int(args[0])
+            except:
+                pass
+
+        query = '\n    '.join([
+            "SELECT min(c) AS cluster, line, COUNT(*) AS cnt, avg(CAST(duration AS REAL)) AS duration",
+            f"FROM audit WHERE drive <> 'z' and ({Audits.date_from(datetime.now() - timedelta(days=30))})",
+            f"GROUP BY line ORDER BY cnt DESC LIMIT {limit};"])
+        log2(query)
+        log2()
+        Audits.run_audit_query(query)
+
+        return state
+
+    def completion(self, state: ReplState):
+        if state.device == ReplState.L:
+            return super().completion(state, {'10': None})
+
+        return {}
+
+    def help(self, _: ReplState):
+        return f'{ShowTop10.COMMAND} [limit]\t show top <limit> audit lines'

{kaqing-2.0.104 → kaqing-2.0.106}/adam/commands/ls.py

@@ -14,7 +14,7 @@ from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState
 from adam.utils import lines_to_tabular, log, log2
 from adam.apps import Apps
-from adam.utils_athena import audit_table_names
+from adam.utils_audits import Audits
 
 class Ls(Command):
     COMMAND = 'ls'
@@ -131,7 +131,7 @@ class Ls(Command):
         log(lines_to_tabular(pg_table_names(pg.namespace, pg.path()), 'NAME', separator=','))
 
     def show_audit_log_tables(self):
-        log(lines_to_tabular(audit_table_names(), 'NAME', separator=','))
+        log(lines_to_tabular(Audits.audit_table_names(), 'NAME', separator=','))
 
     def completion(self, state: ReplState):
         if state.pod:

{kaqing-2.0.104 → kaqing-2.0.106}/adam/commands/preview_table.py

@@ -4,7 +4,7 @@ from adam.commands.postgres.postgres_context import PostgresContext
 from adam.config import Config
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import lines_to_tabular, log, log2
-from adam.utils_athena import audit_table_names, run_audit_query
+from adam.utils_audits import Audits
 
 class PreviewTable(Command):
     COMMAND = 'preview'
@@ -43,7 +43,7 @@ class PreviewTable(Command):
                     lines = [db["name"] for db in pg.tables() if db["schema"] == PostgresContext.default_schema()]
                     log(lines_to_tabular(lines, separator=','))
                 elif state.device == ReplState.L:
-                    log(lines_to_tabular(audit_table_names(), separator=','))
+                    log(lines_to_tabular(Audits.audit_table_names(), separator=','))
                 else:
                     log(lines_to_tabular(cassandra_table_names(state), separator=','))
 
@@ -66,7 +66,7 @@ class PreviewTable(Command):
         if state.device == ReplState.P:
             PostgresContext.apply(state.namespace, state.pg_path).run_sql(f'select * from {table} limit {rows}')
         elif state.device == ReplState.L:
-            run_audit_query(f'select * from {table} limit {rows}')
+            Audits.run_audit_query(f'select * from {table} limit {rows}')
         else:
             run_cql(state, f'select * from {table} limit {rows}', show_out=True, use_single_quotes=True, on_any=True)
 

{kaqing-2.0.104 → kaqing-2.0.106}/adam/commands/show/show.py

@@ -1,5 +1,6 @@
 import click
 
+from adam.commands.audit.show_last10 import ShowLast10
 from adam.commands.command import Command
 from adam.commands.medusa.medusa_show_backupjobs import MedusaShowBackupJobs
 from adam.commands.medusa.medusa_show_restorejobs import MedusaShowRestoreJobs
@@ -42,7 +43,8 @@ class Show(Command):
     def cmd_list():
         return [ShowAppActions(), ShowAppId(), ShowAppQueues(), ShowHost(), ShowLogin(), ShowKubectlCommands(),
                 ShowParams(), ShowProcesses(), ShowRepairs(), ShowStorage(), ShowAdam(),
-                ShowCassandraStatus(), ShowCassandraVersion(), MedusaShowRestoreJobs(), MedusaShowBackupJobs()]
+                ShowCassandraStatus(), ShowCassandraVersion(), MedusaShowRestoreJobs(), MedusaShowBackupJobs(),
+                ShowLast10()]
 
     def completion(self, state: ReplState):
         return super().completion(state)

kaqing-2.0.106/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://4psvtaxlcb.execute-api.us-west-2.amazonaws.com/prod/', 'workers': 3, 'timeout': 10, 'log-audit-queries': False, 'athena': {'auto-repair': {'elapsed_hours': 12}, 'region': 'us-west-2', 'catalog': 'AwsDataCatalog', 'database': 'audit', 'repair-partition-tables': 'audit', 'output': 's3://s3.ops--audit/ddl/results', 'repair-cluster-tables': 'cluster'}}, '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', 'a': {'auto-enter': 'c3/c3'}, 'c': {'auto-enter': 'cluster'}, 'history': {'push-cat-remote-log-file': True}, 'background-process': {'auto-nohup': 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.104 → kaqing-2.0.106}/adam/repl.py

@@ -15,6 +15,7 @@ from adam.commands.command_helpers import ClusterCommandHelper
 from adam.commands.help import Help
 from adam.commands.postgres.postgres_context import PostgresContext
 from adam.config import Config
+from adam.utils_audits import Audits
 from adam.utils_k8s.kube_context import KubeContext
 from adam.utils_k8s.statefulsets import StatefulSets
 from adam.log import Log
@@ -106,7 +107,7 @@ def enter_repl(state: ReplState):
 
     with concurrent.futures.ThreadPoolExecutor(max_workers=Config().get('audit.workers', 3)) as executor:
         # warm up AWS lambda - this log line may timeout and get lost, which is fine
-        executor.submit(audit_log, 'entering kaqing repl', state)
+        executor.submit(Audits.log, 'entering kaqing repl', state.namespace, 'z', 0.0)
 
         # use sorted command list only for auto-completion
         sorted_cmds = sorted(cmd_list, key=lambda cmd: cmd.command())
@@ -141,34 +142,8 @@ def enter_repl(state: ReplState):
                     cmd = f'bash {cmd}'
 
                 if cmd and cmd.strip(' ') and not cmds.run(cmd, state):
-                    try_device_default_action(state, cmds, cmd_list, cmd)
                     # not served by any command in the chain; try SQL query or C3 action
-                    # 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.device == ReplState.L:
-                    #     c_sql_tried = True
-                    #     cmd = f'audit {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'))
+                    try_device_default_action(state, cmds, cmd_list, cmd)
             except EOFError:  # Handle Ctrl+D (EOF) for graceful exit
                 break
             except Exception as e:
@@ -184,7 +159,7 @@ def enter_repl(state: ReplState):
 
                 # offload audit logging
                 if cmd and (state.device != ReplState.L or Config().get('audit.log-audit-queries', False)):
-                    executor.submit(audit_log, cmd, state)
+                    executor.submit(Audits.log, cmd, state.namespace, state.device, time.time() - s0)
 
 def try_device_default_action(state: ReplState, cmds: Command, cmd_list: list[Command], cmd: str):
     c_sql_tried = False
@@ -214,24 +189,6 @@ def try_device_default_action(state: ReplState, cmds: Command, cmd_list: list[Co
         lines = [c.help(state) for c in cmd_list if c.help(state)]
         log2(lines_to_tabular(lines, separator='\t'))
 
-def audit_log(cmd: str, state: ReplState):
-    payload = {
-        'cluster': state.namespace if state.namespace else 'NA',
-        'ts': time.time(),
-        'host': get_my_host(),
-        'user': getpass.getuser(),
-        'line': cmd.replace('"', '""').replace('\n', ' '),
-    }
-    audit_endpoint = Config().get("audit.endpoint", "https://4psvtaxlcb.execute-api.us-west-2.amazonaws.com/prod/")
-    try:
-        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}")
-    except requests.exceptions.Timeout as e:
-        log2(f"Timeout occurred: {e}")
-
 @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')
 @click.option('--config', default='params.yaml', metavar='path', help='path to kaqing parameters file')

{kaqing-2.0.104 → kaqing-2.0.106}/adam/repl_commands.py

@@ -58,7 +58,7 @@ class ReplCommands:
         cmds: list[Command] = ReplCommands.navigation() + ReplCommands.cassandra_check() + ReplCommands.cassandra_ops() + \
             ReplCommands.tools() + ReplCommands.app() + ReplCommands.exit()
 
-        intermediate_cmds: list[Command] = [App(), Reaper(), Repair(), Deploy(), Show(), Undeploy()]
+        intermediate_cmds: list[Command] = [App(), Audit(), Reaper(), Repair(), Deploy(), Show(), Undeploy()]
         ic = [c.command() for c in intermediate_cmds]
         # 1. dedup commands
         deduped = []
@@ -86,7 +86,7 @@ class ReplCommands:
 
     def tools() -> list[Command]:
         return [Cqlsh(), Postgres(), Bash(), Shell(), CodeStart(), CodeStop(), DeployFrontend(), UndeployFrontend(),
-                DeployPod(), UndeployPod(), DeployPgAgent(), UndeployPgAgent(), AuditRepairTables(), AuditRun(), Audit()]
+                DeployPod(), UndeployPod(), DeployPgAgent(), UndeployPgAgent(), Audit()] + Audit.cmd_list()
 
     def app() -> list[Command]:
         return [ShowAppActions(), ShowAppId(), ShowAppQueues(), AppPing(), App()]

{kaqing-2.0.104 → kaqing-2.0.106}/adam/sql/sql_state_machine.py

@@ -299,14 +299,14 @@ SQL_SPEC = [
     #     | FOREIGN KEY ( <column name list> ) REFERENCES <referenced table> ( <referenced column list> )
     #     | CHECK ( <search condition> )
 
-    '                                > alter            > alter',
-    'alter_                          > table            > alter_table                             ^ table',
-    'alter_table_                    > name|audit       > alter_table_t                           ^ tables',
-    'alter_table_t_                  > add              > alter_table_add                         ^ add,add constraint,drop column,drop constraint,rename to',
-    '-                               > drop             > alter_table_drop',
-
-    '                                > preview          > preview',
-    'preview_                        > name|audit       > preview_t                               ^ tables',
+    '                                > alter              > alter',
+    'alter_                          > table              > alter_table                             ^ table',
+    'alter_table_                    > name|audit|cluster > alter_table_t                           ^ tables',
+    'alter_table_t_                  > add                > alter_table_add                         ^ add,add constraint,drop column,drop constraint,rename to',
+    '-                               > drop               > alter_table_drop',
+
+    '                                > preview            > preview',
+    'preview_                        > name|audit         > preview_t                               ^ tables',
 ]
 
 SQL_KEYWORDS = [
@@ -317,7 +317,7 @@ SQL_KEYWORDS = [
     'insert', 'into', 'values',
     'update', 'where', 'set',
     'delete',
-    'audit',
+    'audit', 'cluster',
     'alter', 'table', 'tables', 'add', 'drop', 'with',
     'describe'
 ]