From a3609da1e555163ab8edf8c32c60d5075c83058c Mon Sep 17 00:00:00 2001 From: Haroon Khel <34969545+Haroon-Khel@users.noreply.github.com> Date: Thu, 4 Apr 2024 17:45:44 +0800 Subject: [PATCH 01/16] Remove equinix x64 dockerhost machines from inventory (#3497) --- ansible/inventory.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 0b2fcc92c3..b20812bebd 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -89,8 +89,6 @@ hosts: ubuntu2204-x64-2: {ip: 20.83.24.86, description: 16 cores, 64GB} - equinix: - ubuntu2204-x64-1: {ip: 145.40.113.173, description: Intel Xeon Gold 40 core} - ubuntu2004-x64-1: {ip: 145.40.114.58, description: AMD EPYC 7401P 24 core} ubuntu2004-armv8-1: {ip: 147.75.35.203, description: Ampere Altra 160 core, 512Gb} ubuntu2204-armv8-1: {ip: 139.178.86.243, description: Ampere Altra 160 cores, 512Gb} From b728c86a1b2fe798c29cae85f7b23e50ff9686fa Mon Sep 17 00:00:00 2001 From: Stewart X Addison <6487691+sxa@users.noreply.github.com> Date: Thu, 4 Apr 2024 14:25:35 +0100 Subject: [PATCH 02/16] Changes to support RHEL7/s390x image creation and devkit inclusion (#3492) --------- Signed-off-by: Stewart X Addison --- FAQ.md | 22 +++++++++++++++---- ansible/docker/Dockerfile.RHEL7 | 15 ++++++------- .../AdoptOpenJDK_Unix_Playbook/main.yml | 2 ++ 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/FAQ.md b/FAQ.md index cc850474fb..45c24e5fae 100644 --- a/FAQ.md +++ b/FAQ.md @@ -85,16 +85,30 @@ have at the moment: | Dockerfile | Image | Platforms | Where is this built? | In use? |---|---|---|---|---| | [Centos7](./ansible/docker/Dockerfile.CentOS7) | [`adoptopenjdk/centos7_build_image`](https://hub.docker.com/r/adoptopenjdk/centos7_build_image) | linux on amd64, arm64, ppc64le | [Jenkins](https://ci.adoptium.net/job/centos7_docker_image_updater/) | Yes +| [RHEL7](./ansible/docker/Dockerfile.RHEL7) | n/a - restricted (*) | s390x | [Jenkins](https://ci.adoptium.net/job/rhel7_docker_image_updater/) | Yes | [Centos6](./ansible/docker/Dockerfile.CentOS6) | [`adoptopenjdk/centos6_build_image`](https://hub.docker.com/r/adoptopenjdk/centos6_build_image)| linux/amd64 | [GH Actions](.github/workflows/build.yml) | Yes | [Alpine3](./ansible/docker/Dockerfile.Alpine3) | [`adoptopenjdk/alpine3_build_image`](https://hub.docker.com/r/adoptopenjdk/alpine3_build_image) | linux/x64 & linux/arm64 | [Jenkins](https://ci.adoptium.net/job/centos7_docker_image_updater/) | Yes | [Ubuntu 20.04 (riscv64 only)](./ansible/docker/Dockerfile.Ubuntu2004-riscv64) | [`adoptopenjdk/ubuntu2004_build_image:linux-riscv64`](https://hub.docker.com/r/adoptopenjdk/ubuntu2004_build_image) | linux/riscv64 | [Jenkins](https://ci.adoptium.net/job/centos7_docker_image_updater/) | Yes +
+(*) - Caveats: + +The RHEL7 image creation for s390x has to be run on a RHEL host using a +container implementation supplied by Red Hat, and we are using RHEL8 for +this as it has a stable implemention. The image creation requires the +following: + +1. The host needs to have an active RHEL subscription +2. The RHEL7 devkit (which cannot be made public) to be available in a tar file under /usr/local on the host as per the name in the Dockerfile +
+ When a change lands into master, the relevant dockerfiles are built using the appropriate CI system listed in the table above by configuring them with -the ansible playbooks and pushing them up to Docker Hub where they can be -consumed by our jenkins build agents when the `DOCKER_IMAGE` value is -defined on the jenkins build pipelines as configured in the -[pipeline_config files](https://github.com/AdoptOpenJDK/ci-jenkins-pipelines/tree/master/pipelines/jobs/configurations). +the ansible playbooks and - with the exception of the RHEL7 image for s390x - +pushing them up to Docker Hub where they can be consumed by our jenkins +build agents when the `DOCKER_IMAGE` value is defined on the jenkins build +pipelines as configured in the [pipeline_config +files](https://github.com/AdoptOpenJDK/ci-jenkins-pipelines/tree/master/pipelines/jobs/configurations). ### Adding a new dockerBuild dockerhub repository diff --git a/ansible/docker/Dockerfile.RHEL7 b/ansible/docker/Dockerfile.RHEL7 index e9e0f96bb6..dc0b773fae 100644 --- a/ansible/docker/Dockerfile.RHEL7 +++ b/ansible/docker/Dockerfile.RHEL7 @@ -1,10 +1,5 @@ FROM registry.access.redhat.com/rhel7 -# This dockerfile should be built using this from the top level of the repository: -# ROSIPW=******* docker build --no-cache -t rhel7_build_image -f ansible/docker/Dockerfile.RHEL7 --build-arg ROSIUSER=******* --secret id=ROSIPW --build-arg git_sha="$(git rev-parse --short HEAD)" `pwd` -ARG ROSIUSER -RUN sed -i 's/\(def in_container():\)/\1\n return False/g' /usr/lib64/python*/*-packages/rhsm/config.py -RUN --mount=type=secret,id=ROSIPW,required=true subscription-manager register --username=${ROSIUSER} --password="$(cat /run/secrets/ROSIPW)" --auto-attach -RUN subscription-manager repos --enable rhel-7-for-system-z-optional-rpms +RUN yum-config-manager --enable rhel-7-for-system-z-optional-rpms # ^^ Optional repo needed for Xvfb ARG git_sha @@ -15,6 +10,7 @@ RUN yum --enablerepo=rhel-7-server-ansible-2-for-system-z-rpms install -y ansibl RUN yum clean all COPY . /ansible +COPY devkit /usr/local/devkit RUN echo "localhost ansible_connection=local" > /ansible/hosts @@ -31,7 +27,10 @@ RUN useradd -c "Jenkins user" -d /home/${user} -u 1002 -g 1003 -m ${user} ENV \ JDK7_BOOT_DIR="/usr/lib/jvm/java-1.7.0-openjdk" \ JDK8_BOOT_DIR="/usr/lib/jvm/java-1.8.0-openjdk" \ - JDK10_BOOT_DIR="/usr/lib/jvm/jdk-10" \ JAVA_HOME="/usr/lib/jvm/java-1.8.0-openjdk" -RUN subscription-manager unregister +# While this does bloat the image it is required for building the +# devkit, and the process for that runs as non-root ... +# Disabled for now as we're going to copy from /usr/local/devkit on the host +RUN yum clean all +RUN yum reinstall --downloadonly glibc glibc-headers glibc-devel cups-libs cups-devel libX11 libX11-devel xorg-x11-proto-devel alsa-lib alsa-lib-devel libXext libXext-devel libXtst libXtst-devel libXrender libXrender-devel libXrandr libXrandr-devel freetype freetype-devel libXt libXt-devel libSM libSM-devel libICE libICE-devel libXi libXi-devel libXdmcp libXdmcp-devel libXau libXau-devel libgcc libxcrypt zlib zlib-devel libffi libffi-devel fontconfig fontconfig-devel kernel-headers diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml index e43cf47b4e..059989e1f4 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml @@ -94,6 +94,7 @@ when: - (ansible_distribution != "Alpine" or ansible_architecture != "aarch64") - ansible_architecture != "riscv64" + - ansible_architecture != "s390x" tags: build_tools - role: adoptopenjdk_install # JDK11 Build Bootstrap jdk_version: 10 @@ -120,6 +121,7 @@ - ansible_distribution != "Solaris" - ansible_architecture != "riscv64" - ansible_architecture != "armv7l" + - ansible_architecture != "s390x" tags: build_tools - role: adoptopenjdk_install # Current LTS jdk_version: 21 From f20fe120c4cfda8c71c4f5881094e32d3d857dbc Mon Sep 17 00:00:00 2001 From: Scott Fryer <60462088+steelhead31@users.noreply.github.com> Date: Mon, 8 Apr 2024 12:06:44 +0100 Subject: [PATCH 03/16] inventory: Update public IP for win2019 test machine (#3509) --- ansible/inventory.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index b20812bebd..5d15487bca 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -111,7 +111,7 @@ hosts: - azure: win2016-x64-1: {ip: 52.149.211.210, user: adoptopenjdk} - win2019-x64-1: {ip: 20.185.182.137, user: adoptopenjdk} + win2019-x64-1: {ip: 13.92.177.186, user: adoptopenjdk} win2022-x64-1: {ip: 51.132.234.42, user: adoptopenjdk} win2022-x64-2: {ip: 20.26.116.218, user: adoptopenjdk} win11-aarch64-1: {ip: 20.4.31.184, user: adoptopenjdk} From 2d54a9050c7ee470c01ce12a534c3f5ffe79af0f Mon Sep 17 00:00:00 2001 From: Haroon Khel <34969545+Haroon-Khel@users.noreply.github.com> Date: Mon, 8 Apr 2024 20:53:34 +0800 Subject: [PATCH 04/16] Add windows packages to AWX collections (#3510) --- collections/requirements.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/collections/requirements.yml b/collections/requirements.yml index 9ee87128fb..13a584e939 100644 --- a/collections/requirements.yml +++ b/collections/requirements.yml @@ -4,3 +4,6 @@ collections: - name: community.general source: https://galaxy.ansible.com + + - name: community.windows + source: https://galaxy.ansible.com From 79db1c04a42499ebfa44836f880689a9e54dc359 Mon Sep 17 00:00:00 2001 From: Stewart X Addison <6487691+sxa@users.noreply.github.com> Date: Tue, 9 Apr 2024 09:23:52 +0100 Subject: [PATCH 05/16] inventory: remove spearhead freebsd system (#3504) --- ansible/inventory.yml | 3 --- .../nagios/roles/Nagios_Config/files/Nagios_Server_Config.py | 3 +-- ansible/plugins/inventory/adoptopenjdk_yaml.py | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 5d15487bca..5994ab1f55 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -74,9 +74,6 @@ hosts: win2012r2-x64-2: {ip: 169.48.4.142, user: Administrator} win2022-x64-1: {ip: 52.118.206.11, user: Administrator} - - spearhead: - freebsd12-x64-1: {ip: 185.131.222.224} - - docker: - skytap: diff --git a/ansible/playbooks/nagios/roles/Nagios_Config/files/Nagios_Server_Config.py b/ansible/playbooks/nagios/roles/Nagios_Config/files/Nagios_Server_Config.py index e00f3d27bf..70e2e050ff 100644 --- a/ansible/playbooks/nagios/roles/Nagios_Config/files/Nagios_Server_Config.py +++ b/ansible/playbooks/nagios/roles/Nagios_Config/files/Nagios_Server_Config.py @@ -29,8 +29,7 @@ ## Define Any Hosts That Should Be Excluded -excluded_hosts = {'build-spearhead-freebsd12-x64-1', - 'test-inspira-solaris10u11-sparcv9-1', +excluded_hosts = {'test-inspira-solaris10u11-sparcv9-1', 'build-inspira-solaris10u11-sparcv9-1', 'build-inspira-solaris10u11-sparcv9-2', 'infrastructure-aws-ubuntu1804-x64-1', diff --git a/ansible/plugins/inventory/adoptopenjdk_yaml.py b/ansible/plugins/inventory/adoptopenjdk_yaml.py index f88ba3ba5c..3fe8ef8013 100755 --- a/ansible/plugins/inventory/adoptopenjdk_yaml.py +++ b/ansible/plugins/inventory/adoptopenjdk_yaml.py @@ -47,7 +47,7 @@ # providers - validated for consistency 'provider': ('alibaba', 'azure', 'marist', 'osuosl', - 'macstadium', 'macincloud', 'ibmcloud', 'spearhead', 'siteox', + 'macstadium', 'macincloud', 'ibmcloud', 'siteox', 'equinix', 'linaro','digitalocean', 'ibm', 'godaddy', 'aws', 'inspira', 'equinix_esxi', 'nine', 'scaleway', 'skytap', 'hetzner') From 9892a79e97b6e61cb05bc7abad0701cd5753b5a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:45:11 +1200 Subject: [PATCH 06/16] build(deps): bump docker/setup-buildx-action from 3.1.0 to 3.3.0 (#3512) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.1.0 to 3.3.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/0d103c3126aa41d772a8362f6aa67afac040f80c...d70bba72b1f3fd22344832f00baa16ece964efeb) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Martijn Verburg --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9238511028..5f5b1044b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Set up Docker Buildx to use cache feature - uses: docker/setup-buildx-action@0d103c3126aa41d772a8362f6aa67afac040f80c # v3.1.0 + uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0 - name: Login to Docker Hub uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3 @@ -68,7 +68,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Set up Docker Buildx to use cache feature - uses: docker/setup-buildx-action@0d103c3126aa41d772a8362f6aa67afac040f80c # v3.1.0 + uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0 - name: Docker Build Alpine3 Image uses: docker/build-push-action@af5a7ed5ba88268d5278f7203fb52cd833f66d6e # v5.2.0 From 58d8783ff91fece6e09de91972b4889e32d99cbf Mon Sep 17 00:00:00 2001 From: Haroon Khel <34969545+Haroon-Khel@users.noreply.github.com> Date: Thu, 11 Apr 2024 16:55:34 +0800 Subject: [PATCH 07/16] docker: Assign port number to static docker container during automated deployment (#3511) * Assign port number to static docker container * satisfy linter * modify docker_port variable --------- Co-authored-by: Martijn Verburg --- .../roles/deploy_container/tasks/deploy.yml | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/deploy_container/tasks/deploy.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/deploy_container/tasks/deploy.yml index f6382e7038..e12470d7cf 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/deploy_container/tasks/deploy.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/deploy_container/tasks/deploy.yml @@ -22,14 +22,20 @@ - name: Build {{ docker_image }} docker images command: docker build --cpu-period=100000 --cpu-quota=800000 -t aqa_{{ docker_image }} --memory=6G -f /tmp/Dockerfile.{{ docker_image }} /tmp/ -# Without specifying a port here, docker will give the container a random unused port -- name: Run {{ docker_image }} docker container - command: docker run --restart unless-stopped -p 22 --cpuset-cpus="0-3" --memory=6G --detach --name {{ docker_image | upper }}.PORT aqa_{{ docker_image }} +# Finds the highest port number already assigned and +1 +- name: Find available port + shell: docker ps --format \"\{\{\.Ports\}\}\" | awk -F[:-] '{print $2}' | sort | tail -n 1 + register: docker_port_output + +- name: Set docker_port variable if empty + set_fact: + docker_port: 32000 + when: docker_port_output.stdout == "" -# Now we want to rename the running container with the port name -- name: Find assigned port of {{ docker_image }} container - shell: docker port {{ docker_image | upper }}.PORT | head -n 1 | cut -d ':' -f 2 - register: docker_port +- name: Set docker_port variable when non empty + set_fact: + docker_port: "{{ docker_port_output.stdout | int + 1 }}" + when: not (docker_port_output.stdout == "") -- name: Rename {{ docker_image }} container to {{ docker_image | upper }}.{{ docker_port.stdout_lines[0] }} - command: docker rename {{ docker_image | upper }}.PORT {{ docker_image | upper }}.{{ docker_port.stdout_lines[0] }} +- name: Run {{ docker_image }} docker container + command: docker run --restart unless-stopped -p {{ docker_port }}:22 --cpuset-cpus="0-3" --memory=6G --detach --name {{ docker_image | upper }}.{{ docker_port }} aqa_{{ docker_image }} From 31214c7708c6c072efdd43063abef686b6258792 Mon Sep 17 00:00:00 2001 From: Scott Fryer <60462088+steelhead31@users.noreply.github.com> Date: Thu, 11 Apr 2024 11:42:07 +0100 Subject: [PATCH 08/16] Inventory: Remove IBMCloud Win2012 Machines (#3516) --- ansible/inventory.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 5994ab1f55..bac7f050ce 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -70,8 +70,6 @@ hosts: solaris10u11-sparcv9-1: {ip: cloud.siteox.com, port: 24322} - ibmcloud: - win2012r2-x64-1: {ip: 169.48.4.138, user: Administrator} - win2012r2-x64-2: {ip: 169.48.4.142, user: Administrator} win2022-x64-1: {ip: 52.118.206.11, user: Administrator} - docker: @@ -173,5 +171,3 @@ hosts: rhel6-x64-1: {ip: 169.48.4.140} rhel7-x64-1: {ip: 169.48.4.136} ubuntu1604-x64-1: {ip: 169.48.4.141} - win2012r2-x64-1: {ip: 169.48.4.131, user: Administrator} - win2012r2-x64-2: {ip: 169.48.4.139, user: Administrator} From 267b00809642c35485fdbbf868ec9e020c6b01fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 15:46:30 +0200 Subject: [PATCH 09/16] build(deps): bump actions/setup-python from 5.0.0 to 5.1.0 (#3493) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5.0.0 to 5.1.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/0a5c61591373683505ea898e09a3ea4f39ef2b9c...82c7e631bb3cdc910f68e0081d67478d79c6982d) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Martijn Verburg --- .github/workflows/linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 4f7dbebf30..f1b487954a 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -42,7 +42,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Set up Python 3.x - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0 + uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: python-version: '3.x' From f643812be18efaae31b931349ace3ab9e136cb73 Mon Sep 17 00:00:00 2001 From: Scott Fryer <60462088+steelhead31@users.noreply.github.com> Date: Tue, 23 Apr 2024 14:50:51 +0100 Subject: [PATCH 10/16] GitHubAction : Update Solaris Build Action (#3527) --- .github/workflows/build_vagrant.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build_vagrant.yml b/.github/workflows/build_vagrant.yml index d92af98739..cecfd3789b 100644 --- a/.github/workflows/build_vagrant.yml +++ b/.github/workflows/build_vagrant.yml @@ -24,6 +24,9 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - name: Update Repos + run: sudo apt-get update + - name: Install Ansible run: sudo apt-get install ansible From 75b2f310d4659571678f50617cbc9357f36682d0 Mon Sep 17 00:00:00 2001 From: Scott Fryer <60462088+steelhead31@users.noreply.github.com> Date: Wed, 24 Apr 2024 09:45:53 +0100 Subject: [PATCH 11/16] UnixPB: Remove Nagios Tunnel Scripts For Improved Security (#3526) * UnixPB: Remove Nagios Tunnel Scripts For Improved Security * UnixPB: Remove Nagios tunnel from dockerhost pb --- .../AdoptOpenJDK_Unix_Playbook/dockerhost.yml | 4 - .../AdoptOpenJDK_Unix_Playbook/main.yml | 4 - .../roles/Nagios_Master_Config/tasks/main.yml | 29 -- .../roles/Nagios_Tunnel/tasks/main.yml | 76 ----- .../Nagios_Ansible_Config_tool.sh | 306 ------------------ .../Nagios_RemoteTunnel.sh | 20 -- .../Nagios_Ansible_Config_tool/README.md | 20 -- .../templates/apt.cfg | 10 - .../templates/check_mem.cfg | 6 - .../templates/check_ntp_timesync.cfg | 7 - .../templates/check_timesync.cfg | 7 - .../templates/dnf.cfg | 10 - .../templates/hostgroup_template.cfg | 5 - .../templates/mac.cfg | 10 - .../templates/pkg.cfg | 10 - .../templates/template.cfg | 45 --- .../templates/template_with_graph.cfg | 48 --- .../templates/yum.cfg | 10 - .../templates/zypper.cfg | 10 - 19 files changed, 637 deletions(-) delete mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Master_Config/tasks/main.yml delete mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Tunnel/tasks/main.yml delete mode 100644 ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/Nagios_Ansible_Config_tool.sh delete mode 100644 ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/Nagios_RemoteTunnel.sh delete mode 100644 ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/README.md delete mode 100644 ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/apt.cfg delete mode 100644 ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/check_mem.cfg delete mode 100644 ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/check_ntp_timesync.cfg delete mode 100644 ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/check_timesync.cfg delete mode 100644 ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/dnf.cfg delete mode 100644 ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/hostgroup_template.cfg delete mode 100644 ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/mac.cfg delete mode 100644 ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/pkg.cfg delete mode 100644 ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/template.cfg delete mode 100644 ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/template_with_graph.cfg delete mode 100644 ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/yum.cfg delete mode 100644 ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/zypper.cfg diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/dockerhost.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/dockerhost.yml index 70c7568bb6..31999b153f 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/dockerhost.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/dockerhost.yml @@ -33,10 +33,6 @@ jdk_version: 21 - role: Nagios_Plugins # AdoptOpenJDK Infrastructure tags: [nagios_plugins, adoptopenjdk] - - role: Nagios_Master_Config # AdoptOpenJDK Infrastructure - tags: [nagios_master_config, adoptopenjdk] - - role: Nagios_Tunnel # AdoptOpenJDK Infrastructure - tags: [nagios_tunnel, adoptopenjdk] - Security - Vendor - IPv6 diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml index 059989e1f4..acbe6830fd 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml @@ -131,10 +131,6 @@ tags: build_tools - role: Nagios_Plugins # AdoptOpenJDK Infrastructure tags: [nagios_plugins, adoptopenjdk] - - role: Nagios_Master_Config # AdoptOpenJDK Infrastructure - tags: [nagios_master_config, adoptopenjdk] - - role: Nagios_Tunnel # AdoptOpenJDK Infrastructure - tags: [nagios_tunnel, adoptopenjdk] - riscv_cross_compiler # For building JDK11/J9 on RISC-V architecture - Clean_Up - Security diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Master_Config/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Master_Config/tasks/main.yml deleted file mode 100644 index f0656830fe..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Master_Config/tasks/main.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -######################## -# Nagios_Master_Config # -######################## -# -# Note: -# This script will enable monitoring of a Nagios client system for the following standard services: -# Current Load, Current Users, Disk Space Root Partition, PING, RAM, SSH, Total Processes, Zombie Process -# Anything beyond the standard defaults would require manual configuration. Such has adding monitoring for web sites. -# If the client system is already being monitored by Nagios it will be skipped. -# -# Requirements: -# The 'Nagios_Plugins' role must have completed successfully -# The AWX (Ansible Tower) host but have the root ssh key to access the Nagios Master -# Nagios_Monitoring: Enabled - must be set in the group_vars -# Nagios_Master_IP: x.x.x.x - must be set in the group_vars -# Script must exist on Nagios Master -# -- name: Set SSH port number to 22 if undefined in inventory.yml - set_fact: ansible_port="22" - when: - - ansible_port is not defined - -- name: SSH into the Nagios Master and excute the Nagios_Ansible_Config_tool.sh script - command: ssh -o StrictHostKeyChecking=no root@{{ Nagios_Master_IP }} "/usr/local/nagios/Nagios_Ansible_Config_tool/Nagios_Ansible_Config_tool.sh {{ ansible_distribution }} {{ ansible_architecture }} {{ inventory_hostname }} {{ ansible_host }} {{ provider }} {{ ansible_port }} " - delegate_to: localhost - when: - - Nagios_Monitoring == "Enabled" - - Nagios_Master_IP is defined diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Tunnel/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Tunnel/tasks/main.yml deleted file mode 100644 index cfe0066d25..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Tunnel/tasks/main.yml +++ /dev/null @@ -1,76 +0,0 @@ ---- -################# -# Nagios Tunnel # -################# - -- name: Test if Nagios_RemoteTunnel.sh already exists - stat: - path: /home/nagios/Nagios_RemoteTunnel.sh - failed_when: false - register: tunnel_script_result - -- name: Place Adopt_Tunnel_User.key in nagios users ssh folder - copy: - src: /Vendor_Files/keys/Adopt_Tunnel_User.key - dest: /home/nagios/.ssh/Adopt_Tunnel_User.key - owner: nagios - group: nagios - mode: 0600 - when: - - ansible_port != "22" - - Nagios_Monitoring == "Enabled" - - Nagios_Master_IP is defined - - not tunnel_script_result.stat.exists - tags: [nagios_tunnel, adoptopenjdk] - -- name: Download Nagios_RemoteTunnel.sh script - get_url: - url: https://raw.githubusercontent.com/adoptium/infrastructure/master/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/Nagios_RemoteTunnel.sh - dest: /home/nagios/Nagios_RemoteTunnel.sh - mode: 0755 - checksum: sha256:f2bfb91818fe04ba4f4498c27b5d622f3111e5823d14df0b30a7b8ef9d4dc56f - when: - - ansible_port != "22" - - Nagios_Monitoring == "Enabled" - - Nagios_Master_IP is defined - - not tunnel_script_result.stat.exists - tags: [nagios_tunnel, adoptopenjdk] - -- name: Update Nagios_RemoteTunnel.sh - ReplaceNAGIOSMASTERADDRESS with {{ Nagios_Master_IP }} - replace: - path: /home/nagios/Nagios_RemoteTunnel.sh - regexp: 'ReplaceNAGIOSMASTERADDRESS' - replace: " {{ Nagios_Master_IP }} " - when: - - ansible_port != "22" - - Nagios_Monitoring == "Enabled" - - Nagios_Master_IP is defined - - not tunnel_script_result.stat.exists - tags: [nagios_tunnel, adoptopenjdk] - -- name: Update Nagios_RemoteTunnel.sh - ReplacePortNumber with {{ ansible_port }} - replace: - path: /home/nagios/Nagios_RemoteTunnel.sh - regexp: 'ReplacePortNumber' - replace: " {{ ansible_port }} " - when: - - ansible_port != "22" - - Nagios_Monitoring == "Enabled" - - Nagios_Master_IP is defined - - not tunnel_script_result.stat.exists - tags: [nagios_tunnel, adoptopenjdk] - -- name: Add cron job to keep reverse tunnel alive for nagios user - cron: name="Keep Nagios reverse tunnel alive" - weekday="*" - minute="*" - hour="*" - user=nagios - job="~/Nagios_RemoteTunnel.sh" - state=present - when: - - ansible_port != "22" - - Nagios_Monitoring == "Enabled" - - Nagios_Master_IP is defined - - not tunnel_script_result.stat.exists - tags: [nagios_tunnel, adoptopenjdk] diff --git a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/Nagios_Ansible_Config_tool.sh b/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/Nagios_Ansible_Config_tool.sh deleted file mode 100644 index de624b38ef..0000000000 --- a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/Nagios_Ansible_Config_tool.sh +++ /dev/null @@ -1,306 +0,0 @@ -#!/bin/bash -# -######################## -# Author: Brad Blondin # -######################## -# -######################## -# General Information: # -######################## -# This script will enable monitoring of a Nagios client system for the following standard services: -# Current Load, Current Users, Disk Space Root Partition, PING, RAM, SSH, Total Processes, Zombie Process -# Anything beyond the standard defaults would require manual configuration. Such has adding monitoring for web sites. -# If the client system is already being monitored by Nagios it will be skipped. -# -################ -# Assumptions: # -################ -# This tool will be executed from the Nagios Master -# The Nagios plugins are installed on the Nagios client system -# The Nagios user and its ssh key is configured -# The Nagios client system is using an IPv4 address, for IPv6 configuration will have to be done manually -# * If the Nagios client requires a jumpbox or tunnel manual setup is required -# Nagios Server Configuration Tool expects 6 command line arguments passed to it from Ansible in the followin order: -# {{ ansible_distribution }} {{ ansible_architecture }} {{ inventory_hostname }} {{ ansible_host }} {{ provider }} {{ ansible_port }} -# -#################### -# Global Variables # -#################### -# -Time_Stamp=`date +%Y%m%d-%H%M%S` -Work_Dir=/usr/local/nagios/Nagios_Ansible_Config_tool/ -Nagios_Server_Folder=/usr/local/nagios/etc/servers/ -Template_Dir=$Work_Dir/templates -Nagios_Logo_Folder=/usr/local/nagios/share/images/logos -Nagios_Objects_folder=/usr/local/nagios/etc/objects -Hostgroups_File=$Nagios_Objects_folder/hostgroups.cfg -# -################### -# Slack Variables # -################### -SLACK_CHANNEL=`cat /usr/local/nagios/bin/slack_nagios.pl | grep "SLACK_CHANNEL=" | sed -e 's/.*="//' -e 's/"//'` -SLACK_BOTNAME="nagios" -ICON_EMOJI=":computer:" -WEBHOOK_URL=`cat /usr/local/nagios/bin/slack_nagios.pl | grep "WEBHOOK_URL=" | sed -e 's/.*="//' -e 's/".*//'` -# -######################## -# Data/Enabled Options # -######################## -# -############################### -# Test command line arguments # -############################### -# -if [[ $1 = "" ]] || [[ $2 = "" ]] || [[ $3 = "" ]] || [[ $4 = "" ]] || [[ $5 = "" ]] || [[ $6 = "" ]] ; then # Test: Ensure that 6 command line arguments have been passed - echo "Error: one or more command line arguments are missing" - echo "Expected arguments: {{ ansible_distribution }} {{ ansible_architecture }} {{ inventory_hostname }} {{ ansible_host }} {{ provider }} {{ ansible_port }} " - exit -fi -if [[ ! $4 =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then # Test: Ensure the 4th command line argument is an IP Address - echo "Error: IP address was entered with an invalid format: "$Sys_IPAddress - exit -fi -# -if [ ! -f $Template_Dir/template_with_graph.cfg ] || [ ! -f $Template_Dir/template.cfg ] ; then # Test: Ensure templates exist - echo "Error: Unable to locate templates: "$Template_Dir/template_with_graph.cfg $Template_Dir/template.cfg - exit -fi -# -if ! [[ "$6" =~ ^[0-9]+$ ]] ; then # Test: Ensure {{ ansible_port }} is an integer - echo "Error: {{ ansible_port }} must be an integers" $6 - exit -fi -# -########################################################## -# Convert command line arguments to the script variables # -########################################################## -# -Distro=$1 # {{ ansible_distribution }} -Arch=$2 # {{ ansible_architecture }} -Sys_Hostname=$3 # {{ inventory_hostname }} -Sys_IPAddress=$4 # {{ ansible_host }} -Provider_Name=`echo $5 | tr '[:upper:]' '[:lower:]' | python -c "print raw_input().capitalize()"` # Convert {{ provider }} to lower case and set first char to uppercase -Client_Shortname=`echo $Sys_Hostname | sed 's/\..*//'` # Convert $Sys_Hostname to $Client_Shortname -SSH_Port_Num=$6 # {{ ansible_port }} -# -################################# -# Test if client already exists # -################################# -# -Client_Check=`ls $Nagios_Server_Folder | grep $Client_Shortname` -if [[ ! $Client_Check = "" ]] ; then # Test: If the client is already being monitored by Nagios skip - echo "The Nagios client" $Sys_Hostname "is already being monitored by Nagios... Skipping." - exit -fi -# -############################ -# Enabled Standard Options # -############################ -# This code is here to provide manually override options if you environment differs -Sys_Checkmem="yes" -Sys_Graphs="yes" -Sys_Notifications="yes" -Sys_Alias="yes" -Sys_Alias_Info="Add by Ansible" -Sys_Icon="yes" -# -################ -# Nagios Icons # -################ -# Test: If client $Arch {{ ansible_architecture }} is aarch64 or armv7l then set the Nagios icon to "arm", else use $Distro {{ ansible_distribution }} -if [[ $Arch = "aarch64" ]] || [[ $Arch = "armv7l" ]] ; then - Sys_Icon_Picked=arm -elif [[ $Distro = "MacOSX" ]] ; then - Sys_Icon_Picked="apple" -else - Sys_Icon_Picked=$Distro -fi - -if [ ! -f $Nagios_Logo_Folder/$Sys_Icon_Picked.gd2 ] ; then # If there is no matching icon in Nagios's logo folder default to nagios.gd2 - echo "Logo icon was not found" $Sys_Icon_Picked "Defaulting to nagios icon" - Sys_Icon_Picked=nagios.gd2 -fi -############################# -# Distro Specific Templates # -############################# -# Detect the right package manager to monitor and which script to check the network timesync -Sys_OS="yes" -case "$Distro" in - Ubuntu|Debian) - Sys_OS_pkg_Template=$Template_Dir/apt.cfg - Sys_OS_timesync_Template=$Template_Dir/check_timesync.cfg ;; - RedHat|CentOS) - Sys_OS_pkg_Template=$Template_Dir/yum.cfg - Sys_OS_timesync_Template=$Template_Dir/check_ntp_timesync.cfg ;; - SLES) - Sys_OS_pkg_Template=$Template_Dir/zypper.cfg - Sys_OS_timesync_Template=$Template_Dir/check_timesync.cfg;; - FreeBSD|freebsd) - Sys_OS_pkg_Template=$Template_Dir/pkg.cfg ;; - *) - echo "Error: Unable to select package manager. Thus it will not be monitored" ;; -esac -# -##################### -# Debug Information # -##################### -# -echo -e "\n\n##################################################" -echo "Hostname: "$Client_Shortname -echo "IP Address: "$Sys_IPAddress -echo "SSH Port Number: "$SSH_Port_Num -echo "Enable check_mem: "$Sys_Checkmem -echo "Enable Nagios Graphs: "$Sys_Graphs -echo "Enable Icons: "$Sys_Icon $Sys_Icon_Picked -echo "Enable Notifications: "$Sys_Notifications -echo "Add Description Info: "$Sys_Alias $Sys_Alias_Info -echo "Operating System patches "$Sys_OS $Sys_OS_pkg_Template -echo "OS Timesync Check: "$Sys_OS_timesync_Template -echo -e "##################################################\n" -# -######## -# Main # -######## -# -################### -# SSH Nagios test # -################### -# -# Test: Ensure an ssh connecttion can be made to Nagios client system by the Nagios user and automatically add fingerprint key -Nagios_Login=`su nagios -c "ssh -o StrictHostKeyChecking=no $Sys_IPAddress uptime"` -# -if [[ $Nagios_Login = "" ]] || [[ $Nagios_Login = "Permission denied, please try again." ]]; then - echo "ERROR: Unable to connect to client $Sys_IPAddress as the nagios user" - echo "Please ensure that the nagios user is able to ssh into the client machine using keys" - exit -fi -# -# -################### -# Create CFG file # -################### -# -cd $Work_Dir # Ensure we are in the right folder -# Template Section -if [[ $Sys_Graphs = "yes" ]]; then # Select template to use, with or without mouse over graphs - config_template=$Template_Dir/template_with_graph.cfg -else - config_template=$Template_Dir/template.cfg -fi -cp $config_template $Client_Shortname.cfg # Create working file for new host config -# -######### -# Icons # -######### -# -if [[ $Sys_Icon = "yes" ]] ; then - # Insert icon information starting one line below notification_period - sed -i "/notification_period/a bbb icon_image ICON_NAME.png" $Client_Shortname.cfg - sed -i "/icon_image/a bbb icon_image_alt ICON_NAME" $Client_Shortname.cfg - sed -i "/icon_image_alt/a bbb statusmap_image ICON_NAME.gd2" $Client_Shortname.cfg - sed -i 's/bbb//' $Client_Shortname.cfg # Remove fake tab place holder bbb - sed -i "s/ICON_NAME/$Sys_Icon_Picked/" $Client_Shortname.cfg # Change ICON_NAME with the name of the icon picked -fi -# -if [[ $Sys_Checkmem = "yes" ]] ; then # Include check_mem service - if [[ $Sys_Graphs = "yes" ]] ; then # with graphs? - Check_Mem_TMP_File=$Template_Dir/check_mem_tmp.file.$RANDOM # Name tmp file with random number - cp $Template_Dir/check_mem.cfg $Check_Mem_TMP_File - sed -i "/check_command/a bbb action_url /nagiosgraph/cgi-bin/show.cgi?host=$HOSTNAME$&service=$SERVICEDESC$' onMouseOver='showGraphPopup(this)' onMouseOut='hideGraphPopup()' rel='/nagiosgraph/cgi-bin/showgraph.cgi?host=$HOSTNAME$&service=$SERVICEDESC$&period=hour&rrdopts=-w+450" $Check_Mem_TMP_File - sed -i 's/bbb//' $Check_Mem_TMP_File # Remove fake tab place holder bbb - cat $Check_Mem_TMP_File >> $Client_Shortname.cfg - rm $Check_Mem_TMP_File # Remove tmp file - else - cat $Template_Dir/check_mem.cfg >> $Client_Shortname.cfg - fi -fi -# -if [[ $Sys_Notifications = "yes" ]] ; then # Enable notifications - sed -i '/notifications_enabled/d' $Client_Shortname.cfg -fi -# -if [[ $Sys_OS = "yes" ]] ; then # Enable checking for Operating System patches - if [[ ! $Sys_OS_pkg_Template = "" ]] ; then # Ensure a package manager was selected $Sys_OS_pkg_Template - cat $Sys_OS_pkg_Template >> $Client_Shortname.cfg - fi - if [[ ! $Sys_OS_timesync_Template = "" ]]; then - cat $Sys_OS_timesync_Template >> $Client_Shortname.cfg - fi -fi -##################################### -# Swap vars with system information # -##################################### -# -sed -i "s/ReplaceHostName/$Client_Shortname/" $Client_Shortname.cfg # Swap out ReplaceHostName with $Client_Shortname -# -# Additional configuration for system using a tunnel connection -if [[ $SSH_Port_Num = 22 ]] ; then # Test: what port number is in use for SSH - sed -i "s/ReplaceIPAddress/$Sys_IPAddress/" $Client_Shortname.cfg # Swap out ReplaceIPAddress with $Sys_IPAddress -else - sed -i "s/ReplaceIPAddress/$Sys_IPAddress -p $SSH_Port_Num/" $Client_Shortname.cfg # Swap out ReplaceIPAddress with $Sys_IPAddress and add -p SSH_Port_Num - sed -i '/check_dummy/d' $Client_Shortname.cfg # Remove host check ping command - sed -i "/notification_period/a SYS_NOTES notes *** This host is using a Reverse SSH Tunnel on port $SSH_Port_Num ***" # Insert 'notes' after 'notification_period' and fack tab place holder SYS_NOTES - sed -i 's/SYS_NOTES//' $Client_Shortname.cfg # Remove fake tab place holder SYSTEM_NOTES -fi -# -if [[ $Sys_Alias = "yes" ]] ; then # Swap and ReplaceAliasDescription - sed -i "s/ReplaceAliasDescription/$Sys_Alias_Info/" $Client_Shortname.cfg # Insert Description provided by $Sys_Alias_info -else - sed -i 's/ReplaceAliasDescription/No information/' $Client_Shortname.cfg # Description = No Information -fi -# -# Nagios client configuration file has been created. -# -############## -# Hostgroups # -############## -# -Provider_Exists=`cat $Hostgroups_File | grep "hostgroup_name" | grep $Provider_Name` # Test if Hostgroup already exists for the Provider_Name -if [[ $Provider_Exists = "" ]] ; then - # The Provider_Name doesn't exists, Create new hostgroup from template for Provider - Hostgroup_Template_TMP_File=$Template_Dir/hostgroup_template.cfg.file.$RANDOM # Name tmp file with random number - cp $Template_Dir/hostgroup_template.cfg $Hostgroup_Template_TMP_File # Create a temp file to work with - sed -i "s/PROVIDER/$Provider_Name/" $Hostgroup_Template_TMP_File # Swap out PROVIDER in temp file - sed -i "s/ALIAS_INFO/$Provider_Name/" $Hostgroup_Template_TMP_File # Swap out ALIAS_INFO in temp file - cat $Hostgroup_Template_TMP_File >> $Hostgroups_File # Add new hostgroup provider to the hostgroups file - rm $Hostgroup_Template_TMP_File # Remove temp file - # Send slack notifications to Admins - curl -X POST --data "payload={\"channel\": \"${SLACK_CHANNEL}\", \"username\": \"${SLACK_BOTNAME}\", \"icon_emoji\": \":nagios:\", \"text\": \"${ICON_EMOJI} New Nagios hostgroup was created while running an Ansible playbook on ${Client_Shortname} Please see $Template_Dir/hostgroup_template.cfg \"}" ${WEBHOOK_URL} -fi -# -Hostgroups_Line_NUM=`cat -n $Hostgroups_File | grep "hostgroup_name" | grep $Provider_Name | awk '{print $1}'` # Get line number of hostgroup_name that matches $Provider_Name -# Test if $Client_Shortname already exists as a member of the hostgroup -# Start reading hostgroups.cfg file at $Hostgroups_Line_NUM. Stop at "members". greping for $Client_Shortname -Hostgroups_Member=`cat $Hostgroups_File | sed -n $Hostgroups_Line_NUM',$p' | sed '/members/q' | grep $Client_Shortname` -# -if [[ $Hostgroups_Member = "" ]] ; then - Hostgroups_Crop_NUM=`cat $Hostgroups_File | sed -n $Hostgroups_Line_NUM',$p' | sed '/members/q' | wc -l` # Get number of line between hostgroup_name/$Provider_Name and members - Hostgroups_Count=`expr $Hostgroups_Line_NUM + $Hostgroups_Crop_NUM - "1"` # Add $Hostgroups_Line_NUM to $Hostgroups_Crop_NUM and subtract 1 - sed -i "${Hostgroups_Count}s/$/,$Client_Shortname/" $Hostgroups_File # On line $Hostgroups_Count add $Client_Shortname to the end of the line -else - echo $Client_Shortname "Already exists in the hostgroup, skipping" -fi -# -##################### -# Pre-flight checks # -##################### -# -echo "Conducting Pre-flight checks..." # System configure file has been created, start Pre-flight checks -mv $Client_Shortname.cfg $Nagios_Server_Folder # Move new cfg file into Nagios -/usr/local/nagios/bin/nagios -v /usr/local/nagios/etc/nagios.cfg > flight_check_$Time_Stamp.log # Pre-flight check -flight_error=`cat flight_check_$Time_Stamp.log | grep Errors | awk '{print $3}'` -flight_warn=`cat flight_check_$Time_Stamp.log | grep Warnings | awk '{print $3}'` -if [[ ! $flight_error = "0" ]] || [[ ! $flight_warn = "0" ]] ; then - echo "ERROR: Something when wrong..." - /usr/local/nagios/bin/nagios -v /usr/local/nagios/etc/nagios.cfg > $Work_Dir/$Client_Shortname.cfg.error_$Time_Stamp.log # Create error log - mv $Nagios_Server_Folder/$Client_Shortname.cfg $Work_Dir/ # Remove $Client_Shortname.cfg - echo "Please see error log: $Work_Dir/$Client_Shortname.cfg.error_$Time_Stamp.log" - echo "Host configure: $Work_Dir/$Client_Shortname.cfg" - # Send slack notifications to Admins - curl -X POST --data "payload={\"channel\": \"${SLACK_CHANNEL}\", \"username\": \"${SLACK_BOTNAME}\", \"icon_emoji\": \":nagios:\", \"text\": \"${ICON_EMOJI} Nagios pre-flight check failed on host ${Client_Shortname} while running an Ansible playbook please see $Work_Dir/$Client_Shortname.cfg.error_$Time_Stamp.log for more information \"}" ${WEBHOOK_URL} - exit -fi -rm flight_check_$Time_Stamp.log # All is good, remove log file -echo "Pre-flight checks have all passed" -sudo /usr/sbin/service nagios restart # Restart the Nagios service to reload new configuration -echo "Nagios has been restart, have a nice day!" diff --git a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/Nagios_RemoteTunnel.sh b/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/Nagios_RemoteTunnel.sh deleted file mode 100644 index 2c918e9565..0000000000 --- a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/Nagios_RemoteTunnel.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# Script to establish Reverse SSH Tunnel to the Nagios server -# Workaround for clients where the Nagios server don't have a direct connection (NAT, Firewalled, etc) -# -############# -# Variables # -############# -REMOTE_HOST="ReplaceNAGIOSMASTERADDRESS" -USER_NAME="nagios" -REMOTE_PORT="ReplacePortNumber" -LOCAL_PORT="22" -LOGIN_PORT="22" -IDENTITY_KEY="/home/nagios/.ssh/Adopt_Tunnel_User.key" -# -########### -# Command # -########### -Reverse_Tunnel="ssh -o StrictHostKeyChecking=no -f -n -N -R $REMOTE_PORT:127.0.0.1:$LOCAL_PORT $USER_NAME@$REMOTE_HOST -p $LOGIN_PORT -i $IDENTITY_KEY" -# Running? if not start it -pgrep -f -x "$Reverse_Tunnel" > /dev/null 2>&1 || $Reverse_Tunnel diff --git a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/README.md b/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/README.md deleted file mode 100644 index deb70ccf3c..0000000000 --- a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/README.md +++ /dev/null @@ -1,20 +0,0 @@ -# Nagios Ansible Config Tool - -This is an automation tool to automatically add client systems to Nagios monitoring via Ansible. - -Currently the tool only supports Unix. - -## How to use the tool - -This script is executed on the Nagios Master, and assumes the following: - - The Nagios Plugins are already installed on the client system - - The Nagios user and it's ssh key is configured - - The Nagios client is using an IPv4 address. - -The script expects 6 command line arguments to be passed to it from Ansible, in the following order: - -```bash -{{ ansible_distribution }} {{ ansible_architecture }} {{ inventory_hostname }} {{ ansible_host }} {{ provider }} {{ ansible_port }} -``` - -https://github.com/adoptium/infrastructure/issues/1670 is being used to track replacing the tool with a purely Ansible approach to setting up Nagios monitoring diff --git a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/apt.cfg b/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/apt.cfg deleted file mode 100644 index 06fdc6a907..0000000000 --- a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/apt.cfg +++ /dev/null @@ -1,10 +0,0 @@ - -define service{ - use generic-service - host_name ReplaceHostName - check_period once-a-day-at-8 - service_description Updates Required - apt - check_command check_by_ssh!/usr/lib/nagios/plugins/check_apt - notifications_enabled 0 - } - diff --git a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/check_mem.cfg b/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/check_mem.cfg deleted file mode 100644 index 7133e71f38..0000000000 --- a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/check_mem.cfg +++ /dev/null @@ -1,6 +0,0 @@ -define service{ - use generic-service - host_name ReplaceHostName - service_description RAM - check_command check_by_ssh!/usr/local/nagios/libexec/check_mem -f -C -w 15 -c 5 - } diff --git a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/check_ntp_timesync.cfg b/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/check_ntp_timesync.cfg deleted file mode 100644 index a7d9b3e7bc..0000000000 --- a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/check_ntp_timesync.cfg +++ /dev/null @@ -1,7 +0,0 @@ -define service{ - use generic-service - host_name ReplaceHostName - service_description Check Network Time System - check_command check_by_ssh!/usr/local/nagios/libexec/check_ntp_timesync - check_interval 15 -} diff --git a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/check_timesync.cfg b/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/check_timesync.cfg deleted file mode 100644 index 30a4e9132d..0000000000 --- a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/check_timesync.cfg +++ /dev/null @@ -1,7 +0,0 @@ -define service{ - use generic-service - host_name ReplaceHostName - service_description Check Network Time System - check_command check_by_ssh!/usr/local/nagios/libexec/check_timesync - check_interval 15 -} diff --git a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/dnf.cfg b/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/dnf.cfg deleted file mode 100644 index b1bb6d1b10..0000000000 --- a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/dnf.cfg +++ /dev/null @@ -1,10 +0,0 @@ - -define service{ - use generic-service - host_name ReplaceHostName - service_description Updates Required - DNF - check_period once-a-day-at-8 - check_command check_by_ssh!/usr/local/nagios/libexec/check_dnf - notifications_enabled 0 - } - diff --git a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/hostgroup_template.cfg b/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/hostgroup_template.cfg deleted file mode 100644 index 1415618d97..0000000000 --- a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/hostgroup_template.cfg +++ /dev/null @@ -1,5 +0,0 @@ -define hostgroup{ - hostgroup_name PROVIDER - alias ALIAS_INFO - members - } diff --git a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/mac.cfg b/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/mac.cfg deleted file mode 100644 index 2c94bb6f6f..0000000000 --- a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/mac.cfg +++ /dev/null @@ -1,10 +0,0 @@ - -define service{ - use local-service - host_name ReplaceHostName - check_period once-a-day-at-8 - service_description Updates Required - softwareupdate - check_command remote_check_sw_up_mac - notifications_enabled 0 - } - diff --git a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/pkg.cfg b/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/pkg.cfg deleted file mode 100644 index 183e09ee90..0000000000 --- a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/pkg.cfg +++ /dev/null @@ -1,10 +0,0 @@ - -define service{ - use generic-service - host_name ReplaceHostName - check_period once-a-day-at-8 - service_description Updates Required - PKG - check_command check_by_ssh!/usr/local/nagios/libexec/check_pkg 2>1 /dev/null - notifications_enabled 0 - } - diff --git a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/template.cfg b/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/template.cfg deleted file mode 100644 index 04fe964c77..0000000000 --- a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/template.cfg +++ /dev/null @@ -1,45 +0,0 @@ -define host { - use linux-server - host_name ReplaceHostName - alias ReplaceAliasDescription - address ReplaceIPAddress - check_command check_ssh!-4 -t 60 - max_check_attempts 5 - check_period 24x7 - notification_interval 30 - notification_period 24x7 - notifications_enabled 0 -} - -define service{ - use generic-service - host_name ReplaceHostName - service_description Current Load - check_command check_by_ssh!/usr/local/nagios/libexec/check_load -w 15,10,5 -c 30,24,20 - check_interval 30 - notifications_enabled 0 -} - -define service{ - use generic-service - host_name ReplaceHostName - service_description Disk Space Root Partition - check_command check_by_ssh!/usr/local/nagios/libexec/check_disk -w 20% -c 10% -p / - check_interval 60 -} - -define service{ - use generic-service - host_name ReplaceHostName - service_description Check Jenkins Connection - check_command check_agent!ReplaceHostName - check_interval 30 -} - -define service{ - use local-service - host_name ReplaceHostName - service_description PING - check_interval 15 - check_command check_ping!200.0,20%!500.0,60% -} diff --git a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/template_with_graph.cfg b/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/template_with_graph.cfg deleted file mode 100644 index be28966851..0000000000 --- a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/template_with_graph.cfg +++ /dev/null @@ -1,48 +0,0 @@ -define host { - use linux-server - host_name ReplaceHostName - alias ReplaceAliasDescription - address ReplaceIPAddress - check_command check_ssh!-4 -t 60 - max_check_attempts 5 - check_period 24x7 - notification_interval 30 - notification_period 24x7 - notifications_enabled 0 -} - -define service{ - use generic-service - host_name ReplaceHostName - service_description Current Load - check_command check_by_ssh!/usr/local/nagios/libexec/check_load -w 15,10,5 -c 30,24,20 - check_interval 30 - action_url /nagiosgraph/cgi-bin/show.cgi?host=$HOSTNAME$&service=$SERVICEDESC$' onMouseOver='showGraphPopup(this)' onMouseOut='hideGraphPopup()' rel='/nagiosgraph/cgi-bin/showgraph.cgi?host=$HOSTNAME$&service=$SERVICEDESC$&period=hour&rrdopts=-w+450 - notifications_enabled 0 -} - -define service{ - use generic-service - host_name ReplaceHostName - service_description Disk Space Root Partition - check_command check_by_ssh!/usr/local/nagios/libexec/check_disk -w 20% -c 10% -p / - check_interval 60 - action_url /nagiosgraph/cgi-bin/show.cgi?host=$HOSTNAME$&service=$SERVICEDESC$' onMouseOver='showGraphPopup(this)' onMouseOut='hideGraphPopup()' rel='/nagiosgraph/cgi-bin/showgraph.cgi?host=$HOSTNAME$&service=$SERVICEDESC$&period=hour&rrdopts=-w+450 -} - -define service{ - use generic-service - host_name ReplaceHostName - service_description Check if Jenkins Agent Connected - check_command check_agent!ReplaceHostName - check_interval 30 - action_url /nagiosgraph/cgi-bin/show.cgi?host=$HOSTNAME$&service=$SERVICEDESC$' onMouseOver='showGraphPopup(this)' onMouseOut='hideGraphPopup()' rel='/nagiosgraph/cgi-bin/showgraph.cgi?host=$HOSTNAME$&service=$SERVICEDESC$&period=hour&rrdopts=-w+450 -} - -define service{ - use local-service - host_name ReplaceHostName - service_description PING - check_interval 15 - check_command check_ping!200.0,20%!500.0,60% -} diff --git a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/yum.cfg b/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/yum.cfg deleted file mode 100644 index 724d2ab472..0000000000 --- a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/yum.cfg +++ /dev/null @@ -1,10 +0,0 @@ - -define service{ - use generic-service - host_name ReplaceHostName - check_period once-a-day-at-8 - service_description Updates Required - YUM - check_command check_by_ssh!/usr/local/nagios/libexec/check_yum 2>1 /dev/null - notifications_enabled 0 - } - diff --git a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/zypper.cfg b/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/zypper.cfg deleted file mode 100644 index 2bd09fe7ac..0000000000 --- a/ansible/playbooks/Supporting_Scripts/Nagios_Ansible_Config_tool/templates/zypper.cfg +++ /dev/null @@ -1,10 +0,0 @@ - -define service{ - use generic-service - host_name ReplaceHostName - check_period once-a-day-at-8 - service_description Updates Required - Zypper - check_command check_by_ssh!/usr/local/nagios/libexec/check_zypper - notifications_enabled 0 - } - From 31698fd58a8c624384a5dd617c5eb0bdfc6bbc18 Mon Sep 17 00:00:00 2001 From: Scott Fryer <60462088+steelhead31@users.noreply.github.com> Date: Thu, 25 Apr 2024 09:10:07 +0100 Subject: [PATCH 12/16] UnixPB: Include installation of docker-buildx plugin for Ubuntu 20+ (#3532) * UnixPB: install docker-buildx on Ubuntu * UnixPB: Linter fix * GHA: switch from known error with apt-get update See https://github.com/microsoft/linux-package-repositories/issues/130 & https://github.com/kadena-community/kadena.js/pull/2002 * Update build_vagrant.yml * remove workaround for broken ubuntu runner. * Update ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/main.yml Co-authored-by: Stewart X Addison <6487691+sxa@users.noreply.github.com> --------- Co-authored-by: Stewart X Addison <6487691+sxa@users.noreply.github.com> --- .../roles/Docker/tasks/main.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/main.yml index a62210a8a5..f163fd869d 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/main.yml @@ -55,6 +55,14 @@ use: auto # automatic select package manager to use yum, apt and so on when: (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int >= 20) + - name: Install docker build on Ubuntu 20+ + package: + name: + - docker-buildx + state: present + use: auto # automatic select package manager to use yum, apt and so on + when: (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int >= 20) + - name: Install for SLES # zypper does not support in package module include_tasks: sles.yml when: From 682cdde193c5a39dfdf413cc49aa40e275bd6673 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 10:26:56 +0100 Subject: [PATCH 13/16] build(deps): bump uraimo/run-on-arch-action from 2.7.1 to 2.7.2 (#3519) Bumps [uraimo/run-on-arch-action](https://github.com/uraimo/run-on-arch-action) from 2.7.1 to 2.7.2. - [Release notes](https://github.com/uraimo/run-on-arch-action/releases) - [Commits](https://github.com/uraimo/run-on-arch-action/compare/517085f0367c8256bcfa753e3e13e1550af09954...b0ffb25eb00af00468375982384441f063da1741) --- updated-dependencies: - dependency-name: uraimo/run-on-arch-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Martijn Verburg --- .github/workflows/build_qemu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_qemu.yml b/.github/workflows/build_qemu.yml index 2f56f628d7..d0fc73692c 100644 --- a/.github/workflows/build_qemu.yml +++ b/.github/workflows/build_qemu.yml @@ -39,7 +39,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Run on architecture - uses: uraimo/run-on-arch-action@517085f0367c8256bcfa753e3e13e1550af09954 # v2.7.1 + uses: uraimo/run-on-arch-action@b0ffb25eb00af00468375982384441f063da1741 # v2.7.2 with: arch: ${{ matrix.arch }} distro: ${{ matrix.distro }} From 74248b8e131a61134808f49107900408fe7a6b91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 10:27:55 +0100 Subject: [PATCH 14/16] build(deps): bump actions/cache from 4.0.1 to 4.0.2 (#3483) Bumps [actions/cache](https://github.com/actions/cache) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/ab5e6d0c87105b4c9c2047343972218f562e4319...0c45773b623bea8c8e75f6c82b208c3cf94ea4f9) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Martijn Verburg --- .github/workflows/build_vagrant.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_vagrant.yml b/.github/workflows/build_vagrant.yml index cecfd3789b..659380157b 100644 --- a/.github/workflows/build_vagrant.yml +++ b/.github/workflows/build_vagrant.yml @@ -38,7 +38,7 @@ jobs: - name: Cache Solaris10.box id: solaris-10-cache - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: Solaris10.box key: sol10boxcache From 97eba986a3804a6b33d3406e45ace065e6b9d1f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 10:28:02 +0100 Subject: [PATCH 15/16] build(deps): bump docker/build-push-action from 5.2.0 to 5.3.0 (#3475) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5.2.0 to 5.3.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/af5a7ed5ba88268d5278f7203fb52cd833f66d6e...2cdde995de11925a030ce8070c3d77a52ffcf1c0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Martijn Verburg --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5f5b1044b6..ad67c9df38 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: - name: Docker Build CentOS6 Image Test - uses: docker/build-push-action@af5a7ed5ba88268d5278f7203fb52cd833f66d6e # v5.2.0 + uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 with: file: ./ansible/docker/Dockerfile.CentOS6 build-args: git_sha=${{ github.sha }} @@ -50,7 +50,7 @@ jobs: if: github.ref != 'refs/heads/master' - name: Docker Build & Push Centos6 Image to Docker Hub On Merge - uses: docker/build-push-action@af5a7ed5ba88268d5278f7203fb52cd833f66d6e # v5.2.0 + uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 with: file: ./ansible/docker/Dockerfile.CentOS6 build-args: git_sha=${{ github.sha }} @@ -71,7 +71,7 @@ jobs: uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0 - name: Docker Build Alpine3 Image - uses: docker/build-push-action@af5a7ed5ba88268d5278f7203fb52cd833f66d6e # v5.2.0 + uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 with: file: ./ansible/docker/Dockerfile.Alpine3 build-args: git_sha=${{ github.sha }} From b9f1db61b6664cec8095e5a5a059e86bda81c646 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 10:28:13 +0100 Subject: [PATCH 16/16] build(deps): bump docker/login-action from 3.0.0 to 3.1.0 (#3471) Bumps [docker/login-action](https://github.com/docker/login-action) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/343f7c4344506bcbf9b4de18042ae17996df046d...e92390c5fb421da1463c202d546fed0ec5c39f20) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad67c9df38..643c7bfa81 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0 - name: Login to Docker Hub - uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3 + uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_TOKEN }}