kaqing 2.0.77__tar.gz → 2.0.79__tar.gz

{kaqing-2.0.77 → kaqing-2.0.79}/PKG-INFO

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

{kaqing-2.0.77 → kaqing-2.0.79}/adam/commands/show/show.py

@@ -5,6 +5,7 @@ from adam.commands.medusa.medusa_show_backupjobs import MedusaShowBackupJobs
 from adam.commands.medusa.medusa_show_restorejobs import MedusaShowRestoreJobs
 from adam.commands.show.show_app_actions import ShowAppActions
 from adam.commands.show.show_app_queues import ShowAppQueues
+from adam.commands.show.show_host import ShowHost
 from adam.commands.show.show_login import ShowLogin
 from .show_params import ShowParams
 from .show_app_id import ShowAppId
@@ -39,7 +40,7 @@ class Show(Command):
         return super().intermediate_run(cmd, state, args, Show.cmd_list())
 
     def cmd_list():
-        return [ShowAppActions(), ShowAppId(), ShowAppQueues(), ShowLogin(), ShowKubectlCommands(),
+        return [ShowAppActions(), ShowAppId(), ShowAppQueues(), ShowHost(), ShowLogin(), ShowKubectlCommands(),
                 ShowParams(), ShowProcesses(), ShowRepairs(), ShowStorage(), ShowAdam(),
                 ShowCassandraStatus(), ShowCassandraVersion(), MedusaShowRestoreJobs(), MedusaShowBackupJobs()]
 

kaqing-2.0.79/adam/commands/show/show_host.py

@@ -0,0 +1,33 @@
+from adam.commands.command import Command
+from adam.repl_state import ReplState
+from adam.utils import log
+from adam.utils_net import get_my_host
+
+class ShowHost(Command):
+    COMMAND = 'show host'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(ShowHost, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return ShowHost.COMMAND
+
+    def run(self, cmd: str, state: ReplState):
+        if not(args := self.args(cmd)):
+            return super().run(cmd, state)
+
+        log(get_my_host())
+
+        return state
+
+    def completion(self, state: ReplState):
+        return super().completion(state)
+
+    def help(self, _: ReplState):
+        return f'{ShowHost.COMMAND}\t show host'

{kaqing-2.0.77 → kaqing-2.0.79}/adam/repl.py

@@ -23,6 +23,7 @@ from adam.repl_session import ReplSession
 from adam.repl_state import ReplState
 from adam.utils import deep_merge_dicts, deep_sort_dict, lines_to_tabular, log2
 from adam.apps import Apps
+from adam.utils_net import get_my_host
 from . import __version__
 
 def enter_repl(state: ReplState):
@@ -169,7 +170,13 @@ def enter_repl(state: ReplState):
                     executor.submit(audit_log, cmd, state)
 
 def audit_log(cmd: str, state: ReplState):
-    payload = {"line": cmd.replace('"', '""').replace('\n', ' '), "ts": time.time(), "cluster": state.namespace if state.namespace else 'NA', "user": getpass.getuser()}
+    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://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]:

{kaqing-2.0.77 → kaqing-2.0.79}/adam/repl_commands.py

@@ -46,6 +46,7 @@ from adam.commands.show.show_app_id import ShowAppId
 from adam.commands.show.show_cassandra_status import ShowCassandraStatus
 from adam.commands.show.show_cassandra_version import ShowCassandraVersion
 from adam.commands.show.show_commands import ShowKubectlCommands
+from adam.commands.show.show_host import ShowHost
 from adam.commands.show.show_login import ShowLogin
 from adam.commands.show.show_params import ShowParams
 from adam.commands.show.show_processes import ShowProcesses
@@ -77,7 +78,7 @@ class ReplCommands:
 
     def navigation() -> list[Command]:
         return [Ls(), PreviewTable(), DeviceApp(), DevicePostgres(), DeviceCass(), Cd(), Pwd(), ClipboardCopy(),
-                GetParam(), SetParam(), ShowParams(), ShowKubectlCommands(), ShowLogin(), ShowAdam()]
+                GetParam(), SetParam(), ShowParams(), ShowKubectlCommands(), ShowLogin(), ShowAdam(), ShowHost()]
 
     def cassandra_check() -> list[Command]:
         return Describe.cmd_list() + [ShowCassandraStatus(),

kaqing-2.0.79/adam/utils_net.py

@@ -0,0 +1,24 @@
+import socket
+
+MY_HOST = None
+
+def get_my_host():
+    global MY_HOST
+
+    if MY_HOST:
+       return MY_HOST
+
+    MY_HOST = get_ip_from_hostname('host.docker.internal')
+    if not MY_HOST:
+       MY_HOST = socket.gethostname()
+
+    if not MY_HOST:
+       MY_HOST = 'NA'
+
+    return MY_HOST
+
+def get_ip_from_hostname(hostname):
+  try:
+    return socket.gethostbyname(hostname)
+  except socket.gaierror:
+    return None

kaqing-2.0.79/adam/version.py

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

{kaqing-2.0.77 → kaqing-2.0.79}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.77 → kaqing-2.0.79}/kaqing.egg-info/SOURCES.txt

@@ -16,6 +16,7 @@ adam/repl_commands.py
 adam/repl_session.py
 adam/repl_state.py
 adam/utils.py
+adam/utils_net.py
 adam/version.py
 adam/checks/__init__.py
 adam/checks/check.py
@@ -145,6 +146,7 @@ adam/commands/show/show_app_queues.py
 adam/commands/show/show_cassandra_status.py
 adam/commands/show/show_cassandra_version.py
 adam/commands/show/show_commands.py
+adam/commands/show/show_host.py
 adam/commands/show/show_login.py
 adam/commands/show/show_params.py
 adam/commands/show/show_processes.py

{kaqing-2.0.77 → kaqing-2.0.79}/setup.py

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

kaqing-2.0.77/adam/version.py

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