0
0
Fork 0
mirror of https://github.com/netdata/netdata.git synced 2025-04-14 09:38:34 +00:00

Add flag to mark containers as created from official images in analytics. ()

* Add flag to mark containers as created from official images in analytics.

* Fix CI.

* process NETDATA_CONTAINER_IS_OFFICIAL_IMAGE variable from system info and export to anonymous-statistics script

Co-authored-by: Emmanuel Vasilakis <mrzammler@mm.st>
This commit is contained in:
Austin S. Hemmelgarn 2021-10-19 07:29:28 -04:00 committed by GitHub
parent a221b7b2fd
commit 36a9d70880
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 0 deletions
.github/workflows
daemon
database
packaging/docker

View file

@ -84,6 +84,9 @@ jobs:
if: github.event.inputs.version == 'nightly'
run: |
echo "tags=netdata/netdata:latest,netdata/netdata:edge" >> $GITHUB_ENV
- name: Mark image as official
if: github.repository == 'netdata/netdata'
run: echo "OFFICIAL_IMAGE=true" >> $GITHUB_ENV
- name: Setup QEMU
uses: docker/setup-qemu-action@v1
- name: Setup Buildx
@ -99,6 +102,7 @@ jobs:
platforms: linux/amd64,linux/i386,linux/arm/v7,linux/arm64,linux/ppc64le
push: true
tags: ${{ env.tags }}
build-args: OFFICIAL_IMAGE=${{ env.OFFICIAL_IMAGE }}
- name: Failure Notification
uses: rtCamp/action-slack-notify@v2
env:

View file

@ -106,6 +106,7 @@ REQ_BODY="$(cat << EOF
"container_os_version": "${NETDATA_CONTAINER_OS_VERSION}",
"container_os_version_id": "${NETDATA_CONTAINER_OS_VERSION_ID}",
"container_os_detection": "${NETDATA_CONTAINER_OS_DETECTION}",
"container_is_official_image": ${NETDATA_CONTAINER_IS_OFFICIAL_IMAGE},
"system_cpu_detection": "${NETDATA_SYSTEM_CPU_DETECTION}",
"system_cpu_freq": "${NETDATA_SYSTEM_CPU_FREQ}",
"system_cpu_logical_cpu_count": "${NETDATA_SYSTEM_CPU_LOGICAL_CPU_COUNT}",

View file

@ -12,6 +12,7 @@ ARCHITECTURE="$(uname -m)"
CONTAINER="unknown"
CONT_DETECTION="none"
CONTAINER_IS_OFFICIAL_IMAGE="${NETDATA_OFFICIAL_IMAGE:-false}"
if [ -z "${VIRTUALIZATION}" ]; then
VIRTUALIZATION="unknown"
@ -381,6 +382,7 @@ echo "NETDATA_CONTAINER_OS_ID_LIKE=${CONTAINER_ID_LIKE}"
echo "NETDATA_CONTAINER_OS_VERSION=${CONTAINER_VERSION}"
echo "NETDATA_CONTAINER_OS_VERSION_ID=${CONTAINER_VERSION_ID}"
echo "NETDATA_CONTAINER_OS_DETECTION=${CONTAINER_OS_DETECTION}"
echo "NETDATA_CONTAINER_IS_OFFICIAL_IMAGE=${CONTAINER_IS_OFFICIAL_IMAGE}"
echo "NETDATA_HOST_OS_NAME=${HOST_NAME}"
echo "NETDATA_HOST_OS_ID=${HOST_ID}"
echo "NETDATA_HOST_OS_ID_LIKE=${HOST_ID_LIKE}"

View file

@ -1640,6 +1640,8 @@ int rrdhost_set_system_info_variable(struct rrdhost_system_info *system_info, ch
return res;
else if (!strcmp(name, "NETDATA_SYSTEM_DISK_DETECTION"))
return res;
else if (!strcmp(name, "NETDATA_CONTAINER_IS_OFFICIAL_IMAGE"))
return res;
else {
res = 1;
}

View file

@ -57,6 +57,9 @@ RUN mkdir -p /app/usr/sbin/ \
# hadolint ignore=DL3007
FROM netdata/base:latest as base
ARG OFFICIAL_IMAGE=false
ENV NETDATA_OFFICIAL_IMAGE=$OFFICIAL_IMAGE
# Configure system
ARG NETDATA_UID=201
ARG NETDATA_GID=201
@ -115,3 +118,5 @@ EXPOSE $NETDATA_LISTENER_PORT
ENTRYPOINT ["/usr/sbin/run.sh"]
HEALTHCHECK --interval=60s --timeout=10s --retries=3 CMD /usr/sbin/health.sh
ONBUILD ENV NETDATA_OFFICIAL_IMAGE=false