Project import generated by Copybara.

GitOrigin-RevId: b9887febdfb6e72d7e84669b07b351b924c4a089

Author: alesnovak-s1

CHANGELOG.md

@@ -1,6 +1,19 @@
 Scalyr Agent 2 Changes By Release
 =================================
 
+## 2.2.8 "Marcus" - Nov 20, 2023
+<!---
+Packaged by Ales Novak <[email protected]> on Nov 20, 2023 00:00 -0800
+--->
+
+Features:
+* Added allow_http_monitors root configuration option. If true it forces monitors to use https instead of http where relevant. By default true for fips docker images, false otherwise.
+
+Bug fixes:
+* Tls certificate handling defect in 2.2.4 - https://github.com/scalyr/scalyr-agent-2/issues/1199
+* Python2 support fixed (broken with version 2.2.7)
+
+
 ## 2.2.7 "Zeratul" - Nov 6, 2023
 <!---
 Packaged by Ales Novak <[email protected]> on Nov 6, 2023 00:00 -0800

VERSION

@@ -1 +1 @@
-2.2.7.pre8.1
+2.2.8

k8s/default-namespace/scalyr-agent-2.yaml

@@ -50,7 +50,7 @@ spec:
         envFrom:
         - configMapRef:
             name: scalyr-config
-        image: scalyr/scalyr-k8s-agent:2.2.7
+        image: scalyr/scalyr-k8s-agent:2.2.8
         imagePullPolicy: Always
         name: scalyr-agent
         securityContext:

k8s/no-kustomize/scalyr-agent-2.yaml

@@ -50,7 +50,7 @@ spec:
         envFrom:
         - configMapRef:
             name: scalyr-config
-        image: scalyr/scalyr-k8s-agent:2.2.7
+        image: scalyr/scalyr-k8s-agent:2.2.8
         imagePullPolicy: Always
         name: scalyr-agent
         securityContext:

k8s/scalyr-agent-2-envfrom.yaml

@@ -49,7 +49,7 @@ spec:
         envFrom:
         - configMapRef:
             name: scalyr-config
-        image: scalyr/scalyr-k8s-agent:2.2.7
+        image: scalyr/scalyr-k8s-agent:2.2.8
         imagePullPolicy: Always
         name: scalyr-agent
         securityContext:

k8s/scalyr-agent-2.yaml

@@ -49,7 +49,7 @@ spec:
         envFrom:
         - configMapRef:
             name: scalyr-config
-        image: scalyr/scalyr-k8s-agent:2.2.7
+        image: scalyr/scalyr-k8s-agent:2.2.8
         imagePullPolicy: Always
         name: scalyr-agent
         securityContext:

tests/end_to_end_tests/managed_packages_tests/remote_machine_tests/tools/__init__.py

@@ -30,10 +30,12 @@
     LinuxAIOPackagesBuilder,
     LinuxNonAIOPackageBuilder,
 )
+from scalyr_agent import scalyr_logging
 
 _STABLE_REPO_URL = "https://scalyr-repo.s3.amazonaws.com/stable"
 _PARENT_DIR = pl.Path(__file__).parent
 
+global_log = scalyr_logging.getLogger(__name__)
 
 def get_packages_stable_version(version: str = None):
 
@@ -74,12 +76,13 @@ def download_stable_packages(
     output_dir.mkdir(parents=True, exist_ok=True)
     agent_package_path = output_dir / file_name
     if agent_package_path.exists():
-        raise Exception("While downloading a stable package, found an existing one: " + str(agent_package_path))
-    with requests.Session() as s:
-        resp = s.get(url=package_url)
-        resp.raise_for_status()
+        global_log.info("While downloading a stable package, found an existing one, skipping: " + str(agent_package_path))
+    else:
+        with requests.Session() as s:
+            resp = s.get(url=package_url)
+            resp.raise_for_status()
 
-        agent_package_path.write_bytes(resp.content)
+            agent_package_path.write_bytes(resp.content)
 
 
 def create_packages_repo_root(