Skip to content

[pull] master from kevoreilly:master #458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Apr 27, 2026
Merged

[pull] master from kevoreilly:master #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions conf/default/distributed.conf.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,3 @@ autodiscovery = 600
# Instances should start with following name pattern
instance_name = cape-server

[gcs]
enabled = no
delete_after_upload = no
3 changes: 3 additions & 0 deletions conf/default/reporting.conf.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,3 +240,6 @@ auth_by = vm
# only if auth_by = json. The absolute path to your Google Cloud service account JSON key file.
# This file is required for authentication.
credentials_path = data/gcp-credentials.json

# Delete local report after successful upload to GCS
delete_after_upload = no
4 changes: 2 additions & 2 deletions utils/dist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ def filter(self, record):
RESTAPI_FETCH = dist_conf.distributed.get("restapi")

# GCS Configuration
GCS_ENABLED = dist_conf.gcs.enabled
GCS_DELETE_AFTER_UPLOAD = dist_conf.gcs.get("delete_after_upload")
GCS_ENABLED = reporting_conf.gcs.get("enabled", False) if hasattr(reporting_conf, "gcs") else False
GCS_DELETE_AFTER_UPLOAD = reporting_conf.gcs.get("delete_after_upload", False) if hasattr(reporting_conf, "gcs") else False

if GCS_ENABLED:
from modules.reporting.gcs import GCSUploader
Expand Down
Loading