kaqing 2.0.77__py3-none-any.whl → 2.0.78__py3-none-any.whl

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()]
 

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'

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]:

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(),

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

adam/version.py

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

{kaqing-2.0.77.dist-info → kaqing-2.0.78.dist-info}/METADATA

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

{kaqing-2.0.77.dist-info → kaqing-2.0.78.dist-info}/RECORD

@@ -9,12 +9,13 @@ adam/embedded_apps.py,sha256=lKPx63mKzJbNmwz0rgL4gF76M9fDGxraYTtNAIGnZ_s,419
 adam/embedded_params.py,sha256=ajRQgWmPbomay3GnncDby_qV0GezKOUaDVcuMMuE7Xc,4701
 adam/log.py,sha256=gg5DK52wLPc9cjykeh0WFHyAk1qI3HEpGaAK8W2dzXY,1146
 adam/pod_exec_result.py,sha256=nq0xnCNOpUGBSijGF0H-YNrwBc9vUQs4DkvLMIFS5LQ,951
-adam/repl.py,sha256=boH2QLfZLSY5ca0g4Ek8XN-g7DX3Jtxb3C0YzPZOjAw,8683
-adam/repl_commands.py,sha256=WA90Rl27Juctzr3U3kfCDk5N-oYMKlfWbZeafUgk7k0,4723
+adam/repl.py,sha256=FEFrCD7Z4jZ76Q5d2EiJ8KrC8_ZXF-CrL3arndLnc74,8792
+adam/repl_commands.py,sha256=NtV4F4aCAw1CkKjPfMDbatsdJQq-bJcc0iUkYBYQ-c8,4785
 adam/repl_session.py,sha256=uIogcvWBh7wd8QQ-p_JgLsyJ8YJgINw5vOd6JIsd7Vo,472
 adam/repl_state.py,sha256=nZO5CucSIGz68f4JreadGphRzMXPUzkTn-4XcoJJOug,8643
 adam/utils.py,sha256=sbsNZP3qGJtb6fXCa4dDXHry5ay9ev583cCZIQzy07s,7382
-adam/version.py,sha256=3Gt7R-XJFkwlA78c_owQ_iriomUmChf_kliAOqLCyFQ,139
+adam/utils_net.py,sha256=65fhBnWMCkhGtyHqz95qcHaCo35q-WX1RBkkXG8dKpI,416
+adam/version.py,sha256=38CgAnn7yjWD9hW4xZOuwZYxd1aCDtDPMxdDRQ_BdSg,139
 adam/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/checks/check.py,sha256=Qopr3huYcMu2bzQgb99dEUYjFzkjKHRI76S6KA9b9Rk,702
 adam/checks/check_context.py,sha256=FEHkQ32jY1EDopQ2uYWqy9v7aEEX1orLpJWhopwAlh4,402
@@ -135,7 +136,7 @@ adam/commands/repair/repair_run.py,sha256=C9F86ia46rBCwkP8BFM5nw-AJ05jm4Bx9wnMny
 adam/commands/repair/repair_scan.py,sha256=m6PErrbuQgryCMm_2pbGAwQdKNQvXLahcHXFfNKoU-s,2439
 adam/commands/repair/repair_stop.py,sha256=on3jHmOwtWOL7SJlFd8ryBflzqDsxwJNwtAbhDjYUNc,1193
 adam/commands/show/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/commands/show/show.py,sha256=rPhozvl8Yb7sBRNg_byw15jLRVLeN-mbms3wKyl78xI,1981
+adam/commands/show/show.py,sha256=JQn1j9XQ8xZVl_TtI_qFzYBcsUZd3JMNrPgKx5XKUqU,2043
 adam/commands/show/show_adam.py,sha256=osuafMipN2My4O7bLdukBLsDHtTKguDfTagmgz7aZvw,1314
 adam/commands/show/show_app_actions.py,sha256=3knASTOIecvdLEJusbsGEGXVxeCpqHozbnFAEq_2pqY,1925
 adam/commands/show/show_app_id.py,sha256=-2hxOUv_Rm_j6d6PWVcHW-w-_alfGrOB4chmVQS48Bs,1384
@@ -143,6 +144,7 @@ adam/commands/show/show_app_queues.py,sha256=GvVbyFbdFegHQFTHhn-fl0NaxHgJqPc44fc
 adam/commands/show/show_cassandra_status.py,sha256=cIHHvbAPZAUcMJGsQnUSGvlSspSjlPgdligWTsAQZVU,5157
 adam/commands/show/show_cassandra_version.py,sha256=R22f8zIk_WvvrDP4DkPcqlTx1MVboeyQHDvv1dScUcc,1633
 adam/commands/show/show_commands.py,sha256=ivjY3u3Ph969zOh0dYi0KjAfm7ClUGdQpkJLJAvpeUc,1893
+adam/commands/show/show_host.py,sha256=nJZdk3guvHNZqoy5QDW9xff9bmqPgYVVpteXBp9RE8U,877
 adam/commands/show/show_login.py,sha256=-sF93qA9LmRNWehz1pEXdhxWvHrWAD_ZDalqQsXJhyQ,1868
 adam/commands/show/show_params.py,sha256=LoBj_ScmtsPrXSUH59p3IYAlmL-0Q_Gb01bp_7zrwQA,1008
 adam/commands/show/show_processes.py,sha256=jAesWDD_l0T6ql6LawnGpev-Glz21tFkegtCbYDCTdc,1770
@@ -177,8 +179,8 @@ adam/sso/idp.py,sha256=fvcwUw_URTgsO6ySaqTIw0zQT2qRO1IPSGhf6rPtybo,5804
 adam/sso/idp_login.py,sha256=QAtCUeDTVWliJy40RK_oac8Vgybr13xH8wzeBoxPaa8,1754
 adam/sso/idp_session.py,sha256=9BUHNRf70u4rVKrVY1HKPOEmOviXvkjam8WJxmXSKIM,1735
 adam/sso/sso_config.py,sha256=5N8WZgIJQBtHUy585XLRWKjpU87_v6QluyNK9E27D5s,2459
-kaqing-2.0.77.dist-info/METADATA,sha256=ND97Mgcyt5Mr42VNgKyr38kSuWQX9rgdsWczhjtJv1k,132
-kaqing-2.0.77.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.77.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.77.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.77.dist-info/RECORD,,
+kaqing-2.0.78.dist-info/METADATA,sha256=z1Ra-q6PhQzPWpVl3t6qzfsZEQBz0AAaOfEqrGgQYFo,132
+kaqing-2.0.78.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.78.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.78.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.78.dist-info/RECORD,,