Skip to content

Commit

Permalink
v1.8.2 (#70)
Browse files Browse the repository at this point in the history
  • Loading branch information
MikeSchiessl authored Sep 11, 2024
1 parent 474b746 commit e7cd15c
Show file tree
Hide file tree
Showing 13 changed files with 284 additions and 207 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ARG HOMEDIR="/opt/akamai-uls"
ARG ULS_DIR="$HOMEDIR/uls"
ARG EXT_DIR="$ULS_DIR/ext"

ARG ETP_CLI_VERSION="0.4.7"
ARG ETP_CLI_VERSION="0.4.8"
ARG EAA_CLI_VERSION="0.6.10"
ARG MFA_CLI_VERSION="0.1.1"
ARG GC_CLI_VERSION="v0.0.5"
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ The Unified Log Streamer (ULS) is designed to simplify SIEM integrations for Aka
Thanks to its modular design, ULS allows the connection of many SIEM solutions out-of-the-box.
ULS can send data into any SIEM that supports either file, TCP, UDP or HTTP ingestion.

It can be run directly as Python code, as a provided Docker container, through `docker compose` scripts or through helm within kubernetes.
ULS can be run directly as Python code, as a Docker container, through `docker compose` scripts or through helm within kubernetes.
Running ULS on Windows (python) is also supported (but not extensively tested, yet).

![ULS docker compose usage](docs/images/uls_docker-compose_complex_example.png)

Expand Down
2 changes: 1 addition & 1 deletion bin/modules/UlsArgsParser.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def init():
dest='logdatefmt',
type=str,
default=(os.environ.get('ULS_LOG_DATEFORMAT') or uls_config.log_datefmt),
help=f"Adjust the logging date/time format to your needs, (Default: {uls_config.log_datefmt.replace("%", "%%")})")
help=f"Adjust the logging date/time format to your needs, (Default: {uls_config.log_datefmt.replace('%', '%%')})")
# Added double %% to have argsparser display proper string as it tries do to % replacement :D

# put loglines into debug log
Expand Down
2 changes: 1 addition & 1 deletion bin/modules/UlsTools.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ def get_install_id(install_id_file=str(root_path()) + "/var/uls_install_id"):
def callhome(nocallhome_state: bool, input: str = "n/a", feed: str = "n/a", output: str = "n/a", position: str = "n/a"):
if not nocallhome_state:
try:
url = f"/{position}?version={uls_config.__version__}&input={input}&feed={feed}&output={output}&install_id={get_install_id()['install_id']}&os_platform={platform.platform()}&pyhton={sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}&container={check_container()}"
url = f"/{position}?version={uls_config.__version__}&input={input}&feed={feed}&output={output}&install_id={get_install_id()['install_id']}&os_platform={platform.platform()}&python={sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}&container={check_container()}"
aka_log.log.debug(f"Sending a CallHome request containing the following data: {url}")
result = requests.get(uls_config.callhome_url + url, timeout=int(uls_config.callhome_timeout))
aka_log.log.debug(f"Callhome response code: {result.status_code}")
Expand Down
6 changes: 3 additions & 3 deletions bin/uls_config/global_config.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/usr/bin/env python3

import sys
# Common global variables / constants
__version__ = "1.8.1"
__version__ = "1.8.2"
__tool_name_long__ = "Akamai Unified Log Streamer"
__tool_name_short__ = "ULS"


# Generic config
bin_python = "python3" # Python binary to use (use OS standard when not using path)
bin_python = sys.executable # Python binary to use (use OS standard when not using path)
output_line_breaker = '\r\n' # Line breaking type (to split messages when streaming data)
main_wait_default = 0.01 # Default wait time within the main loop
main_wait_max = 60 # Maximum wait time for the main loop
Expand Down
2 changes: 1 addition & 1 deletion docs/AKAMAI_API_CREDENTIALS.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ Guardicore is using the portal users for API access. Therefore it is recommended
- Go to Administration
- Select "Users" in the left navigation tree
- Click the "Create User" button
- Enter a username and a password, select "Guest" as permission scheme
- Enter a username and a password, select "Support" as permission scheme
- Confirm by clicking the SAVE button
- Now logout and login with the newly created user and follow tha password change procedure
- Note down your guardicore Adminsitration (=API) url without https
Expand Down
Loading

0 comments on commit e7cd15c

Please sign in to comment.