StackVista · LouisParkin · May 15, 2024 · May 15, 2024 · May 15, 2024 · May 15, 2024
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,12 +1,12 @@
-image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-integrations-runner:latest-py38
+image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-integrations-runner:20240919-py311
 stages:
   - build
   - test
   - publish
 
 variables:
   CONDA_ENV: "stackstate-agent-integrations-py-3"
-  PYTHON_VERSION: 3.8.11
+  PYTHON_VERSION: 3.11.8
 
 .rules:
   - &pull_requests
@@ -143,19 +143,6 @@ linux_deps:
       - venv/
     expire_in: 1 week
 
-win_deps:
-  <<: *windows_env
-  <<: *manual_job_rules
-  stage: build
-  interruptible: true
-  script:
-    - conda activate $CONDA_ENV
-    - python -m pip install .\stackstate_checks_dev[cli]
-  artifacts:
-    paths:
-      - venv/
-    expire_in: 1 week
-
 .linux_test: &linux_test
   <<: *linux_env
   <<: *base_integration_rules
@@ -202,14 +189,6 @@ test_stackstate_checks_dev:
   tags:
     - sts-k8s-xl-no-docker-runner
 
-test_kubernetes:
-  <<: *linux_test
-  variables:
-    CHECK: "kubernetes"
-    PYTHON3: "true"
-    DOCKER_HOST: tcp://docker:2375/
-    DOCKER_DRIVER: overlay2
-
 test_dynatrace_base:
   <<: *linux_test
   variables:
@@ -234,7 +213,6 @@ test_dynatrace_health:
     DOCKER_HOST: tcp://docker:2375/
     DOCKER_DRIVER: overlay2
 
-
 test_kubelet:
   <<: *linux_test
   variables:
@@ -243,19 +221,6 @@ test_kubelet:
     DOCKER_HOST: tcp://docker:2375/
     DOCKER_DRIVER: overlay2
 
-test_mysql:
-  <<: *linux_test
-  variables:
-    CHECK: "mysql"
-    PYTHON3: "true"
-    DOCKER_HOST: tcp://docker:2375/
-    DOCKER_DRIVER: overlay2
-    DOCKER_TLS_CERTDIR: ""
-  tags:
-    #- sts-k8s-xl-runner
-    #- sts-aws
-    - sts-k8s-xl-no-docker-runner
-
 test_openmetrics:
   <<: *linux_test
   variables:
@@ -308,49 +273,6 @@ test_splunk_metric:
   tags:
     - sts-k8s-xl-no-docker-runner
 
-test_splunk_event:
-  <<: *linux_test
-  variables:
-    CHECK: "splunk_event"
-    PYTHON3: "true"
-    DOCKER_HOST: tcp://docker:2375/
-    DOCKER_DRIVER: overlay2
-    DOCKER_TLS_CERTDIR: ""
-  tags:
-    - sts-k8s-xl-no-docker-runner
-
-test_cloudera:
-  <<: *linux_test
-  variables:
-    CHECK: "cloudera"
-    PYTHON3: "true"
-    DOCKER_HOST: tcp://docker:2375/
-    DOCKER_DRIVER: overlay2
-
-test_aws_topology:
-  <<: *linux_test
-  variables:
-    CHECK: "aws_topology"
-    PYTHON3: "true"
-    DOCKER_HOST: tcp://docker:2375/
-    DOCKER_DRIVER: overlay2
-
-test_aws_xray:
-  <<: *linux_test
-  variables:
-    CHECK: "aws_xray"
-    PYTHON3: "true"
-    DOCKER_HOST: tcp://docker:2375/
-    DOCKER_DRIVER: overlay2
-
-test_sap:
-  <<: *linux_test
-  variables:
-    CHECK: "sap"
-    PYTHON3: "true"
-    DOCKER_HOST: tcp://docker:2375/
-    DOCKER_DRIVER: overlay2
-
 test_agent_integration_sample:
   <<: *linux_test
   variables:
@@ -431,67 +353,6 @@ test_static_health:
     DOCKER_HOST: tcp://docker:2375/
     DOCKER_DRIVER: overlay2
 
-test_nagios:
-  <<: *linux_test
-  variables:
-    CHECK: "nagios"
-    PYTHON3: "true"
-    DOCKER_HOST: tcp://docker:2375/
-    DOCKER_DRIVER: overlay2
-
-test_solarwinds:
-  <<: *linux_test
-  variables:
-    CHECK: "solarwinds"
-    PYTHON3: "true"
-    DOCKER_HOST: tcp://docker:2375/
-    DOCKER_DRIVER: overlay2
-
-
-.windows_test: &windows_test
-  <<: *windows_env
-  <<: *base_integration_manual_rules
-  stage: test
-  needs:
-    - win_deps
-  script:
-    - conda activate $CONDA_ENV
-    - checksdev test -c %CHECK%
-  interruptible: true
-  tags:
-    - windows_agent7_ps1
-  retry:
-    max: 2
-    when:
-      - runner_system_failure
-      - stuck_or_timeout_failure
-      - script_failure
-
-test_stackstate_checks_dev_win:
-  <<: *windows_test
-  variables:
-    CHECK: "stackstate_checks_dev:py3-default,stackstate_checks_dev:flake8"
-
-test_stackstate_checks_base_win:
-  <<: *windows_test
-  variables:
-    CHECK: "stackstate_checks_base"
-
-test_wmi_check:
-  <<: *windows_test
-  variables:
-    CHECK: "wmi_check"
-
-test_cloudera_win:
-  <<: *windows_test
-  variables:
-    CHECK: "cloudera"
-
-test_aws_xray_win:
-  <<: *windows_test
-  variables:
-    CHECK: "aws_xray"
-
 publish-checks-dev:
   stage: publish
   interruptible: true

diff --git a/.python-version b/.python-version
@@ -1 +1 @@
-3.8.11
+3.11.8
diff --git a/.setup-scripts/conda_env.ps1 b/.setup-scripts/conda_env.ps1
@@ -1,7 +1,7 @@
 $envName = $args[0]
 $pythonVersion = $args[1]
 if ($pythonVersion -eq '3') {
-  $pythonVersion = '3.8'
+  $pythonVersion = '3.11'
 }
 $env_name = conda env list | grep $envName | awk '{print $1}'
 if (($env_name -ne $null) -and ($env_name -eq  $envName)) {

diff --git a/.setup-scripts/image/Dockerfile b/.setup-scripts/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM artifactory.tooling.stackstate.io/docker-virtual/python:3.8.11
+FROM artifactory.tooling.stackstate.io/docker-virtual/python:3.11.8-bullseye
 RUN apt-get update && \
     apt-get install -y virtualenv apt-transport-https ca-certificates curl gnupg2 software-properties-common && \
     apt-get clean && \
@@ -10,4 +10,5 @@ RUN add-apt-repository -y "deb [arch=amd64] https://download.docker.com/linux/de
     apt-get install -y docker-ce docker-ce-cli containerd.io && \
     apt-get clean
 
-RUN curl -L "https://github.com/docker/compose/releases/download/1.24.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+RUN curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+RUN chmod +x /usr/local/bin/docker-compose
diff --git a/.setup-scripts/image/Makefile b/.setup-scripts/image/Makefile
@@ -16,12 +16,12 @@ RUNTIMETAG := $(shell date +%Y%m%d)
 # vvv New runner
 
 build:
-	docker build -t stackstate/stackstate-agent-integrations-runner:$(RUNTIMETAG)-py38 .
+	docker build -t stackstate/stackstate-agent-integrations-runner:$(RUNTIMETAG)-py311 .
 push:
-	docker push stackstate/stackstate-agent-integrations-runner:$(RUNTIMETAG)-py38
+	docker push stackstate/stackstate-agent-integrations-runner:$(RUNTIMETAG)-py311
 
 tag_latest:
-	docker tag stackstate/stackstate-agent-integrations-runner:$(RUNTIMETAG)-py38 stackstate/stackstate-agent-integrations-runner:latest-py38
+	docker tag stackstate/stackstate-agent-integrations-runner:$(RUNTIMETAG)-py311 stackstate/stackstate-agent-integrations-runner:latest-py311
 
 push_latest:
-	docker push stackstate/stackstate-agent-integrations-runner:latest-py38
+	docker push stackstate/stackstate-agent-integrations-runner:latest-py311
diff --git a/.setup-scripts/setup_env.sh b/.setup-scripts/setup_env.sh
@@ -12,16 +12,19 @@ VENV_PATH=$INTEGRATIONS_DIR_TMP/venv
 
 if [ ! -d $VENV_PATH ]; then
   echo "$VENV_PATH doesn't exist, create the venv and loading deps"
-  virtualenv --python=python3.8 --pip=23.1.2 $INTEGRATIONS_DIR_TMP/venv
+  virtualenv --python=python3.11 --pip=23.3.1 $INTEGRATIONS_DIR_TMP/venv
   source $INTEGRATIONS_DIR_TMP/venv/bin/activate
   pip install pylint==2.17.2
   pip install docker==6.1.3
-  pip install -U setuptools
+  pip install --upgrade pip setuptools
+  pip install 'cython<3.0.0'
+  pip install "pyyaml==5.4.1" --no-build-isolation
+  pip install --upgrade wheel
   source $INTEGRATIONS_DIR_TMP/.setup-scripts/load_deps.sh
 else
   echo "$VENV_PATH already exists, only activating the venv"
   ls $INTEGRATIONS_DIR_TMP/venv/bin || echo 'no bin'
-  ls $INTEGRATIONS_DIR_TMP/venv/lib/python3.8/site-packages || echo 'no site-packages'
+  ls $INTEGRATIONS_DIR_TMP/venv/lib/python3.11/site-packages || echo 'no site-packages'
   source $INTEGRATIONS_DIR_TMP/venv/bin/activate
   pip install pylint==2.17.2
   pip install docker==6.1.3

diff --git a/agent_integration_sample/tox.ini b/agent_integration_sample/tox.ini
@@ -7,7 +7,7 @@ envlist =
     flake8
 
 [testenv]
-pip_version = pip==19.3.1
+pip_version = pip==23.3.1
 usedevelop = true
 platform = linux|darwin|win32
 deps =

diff --git a/agent_v2_integration_sample/tox.ini b/agent_v2_integration_sample/tox.ini
@@ -7,7 +7,7 @@ envlist =
     flake8
 
 [testenv]
-pip_version = pip==19.3.1
+pip_version = pip==23.3.1
 usedevelop = true
 platform = linux|darwin|win32
 deps =

diff --git a/agent_v2_integration_stateful_sample/tox.ini b/agent_v2_integration_stateful_sample/tox.ini
@@ -7,7 +7,7 @@ envlist =
     flake8
 
 [testenv]
-pip_version = pip==19.3.1
+pip_version = pip==23.3.1
 usedevelop = true
 platform = linux|darwin|win32
 deps =

diff --git a/agent_v2_integration_transactional_sample/tox.ini b/agent_v2_integration_transactional_sample/tox.ini
@@ -7,7 +7,7 @@ envlist =
     flake8
 
 [testenv]
-pip_version = pip==19.3.1
+pip_version = pip==23.3.1
 usedevelop = true
 platform = linux|darwin|win32
 deps =

diff --git a/aws_topology/.gitignore b/aws_topology/.gitignore
diff --git a/aws_topology/CHANGELOG.md b/aws_topology/CHANGELOG.md
diff --git a/aws_topology/MANIFEST.in b/aws_topology/MANIFEST.in
diff --git a/aws_topology/README.md b/aws_topology/README.md