From 92aa3f32012669ae3736ec8e660c13b9a6b90833 Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Mon, 23 Sep 2024 10:57:53 +0100 Subject: [PATCH 1/2] cmake: update emails and urls for Chronosphere Signed-off-by: Patrick Stephens --- CMakeLists.txt | 4 ++-- MAINTAINERS.md | 8 ++++---- dockerfiles/Dockerfile | 8 ++++---- dockerfiles/Dockerfile.windows | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e42d4faffc..9e6c5ac2613 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1149,8 +1149,8 @@ set(CPACK_PACKAGE_VERSION ${FLB_VERSION_STR}) set(CPACK_PACKAGE_NAME "fluent-bit") set(CPACK_PACKAGE_RELEASE 1) -set(CPACK_PACKAGE_CONTACT "Eduardo Silva ") -set(CPACK_PACKAGE_VENDOR "Calyptia Inc.") +set(CPACK_PACKAGE_CONTACT "Eduardo Silva ") +set(CPACK_PACKAGE_VENDOR "Chronosphere Inc.") set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") set(CPACK_PACKAGING_INSTALL_PREFIX "/") diff --git a/MAINTAINERS.md b/MAINTAINERS.md index a97bc49ad34..3866eaef5c0 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -4,12 +4,12 @@ Fluent Bit is developed and supported by many individuals and companies. The fo | Maintainer Name | Components | Company | | :---------------------------------------------------- | ------------------------ | ------------------------------------------------- | -| [Eduardo Silva](https://github.com/edsiper) | All | [Calyptia](https://calyptia.com) | -| [Leonardo Alminana](https://github.com/leonardo-albertovich) | All | [Calyptia](https://calyptia.com) | +| [Eduardo Silva](https://github.com/edsiper) | All | [Chronosphere](https://chronosphere.io) | +| [Leonardo Alminana](https://github.com/leonardo-albertovich) | All | [Chronosphere](https://chronosphere.io) | | [Masoud Koleini](https://github.com/koleini) | Stream Processor | [Arm](https://www.arm.com/) | -| [Hiroshi Hatake](https://github.com/cosmo0920) | All | [Calyptia](https://calyptia.com) | +| [Hiroshi Hatake](https://github.com/cosmo0920) | All | [Chronosphere](https://chronosphere.io) | | [Fujimoto Seiji](https://github.com/fujimotos) | Windows Platform | Individual | | [Wesley Pettit](https://github.com/PettitWesley) | Amazon Plugins (AWS) | [Amazon Web Services](https://aws.amazon.com/) | | [Cedric Lamoriniere](https://github.com/clamoriniere) | Datadog Output Plugin | [Datadog](https://www.datadoghq.com/) | | [Jonathan Gonzalez V.](https://github.com/sxd) | PostgreSQL Output Plugin | [2ndQuadrant](https://www.2ndquadrant.com/en/) | -| [Jorge Niedbalski](https://github.com/niedbalski) | CI && Containers | [Calyptia](https://calyptia.com/) | +| [Jorge Niedbalski](https://github.com/niedbalski) | CI && Containers | [Chronosphere](https://chronosphere.io/) | diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index feb84bb49d1..d092690c33f 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -160,7 +160,7 @@ ENV FLUENT_BIT_VERSION=${RELEASE_VERSION} LABEL description="Fluent Bit multi-architecture container image" \ vendor="Fluent Organization" \ version="${RELEASE_VERSION}" \ - author="Eduardo Silva " \ + author="Eduardo Silva " \ org.opencontainers.image.description="Fluent Bit container image" \ org.opencontainers.image.title="Fluent Bit" \ org.opencontainers.image.licenses="Apache-2.0" \ @@ -168,7 +168,7 @@ LABEL description="Fluent Bit multi-architecture container image" \ org.opencontainers.image.version="${RELEASE_VERSION}" \ org.opencontainers.image.source="https://github.com/fluent/fluent-bit" \ org.opencontainers.image.documentation="https://docs.fluentbit.io/" \ - org.opencontainers.image.authors="Eduardo Silva " + org.opencontainers.image.authors="Eduardo Silva " # Copy the libraries from the extractor stage into root COPY --from=deb-extractor /dpkg / @@ -191,7 +191,7 @@ ENV FLUENT_BIT_VERSION=${RELEASE_VERSION} LABEL description="Fluent Bit multi-architecture debug container image" \ vendor="Fluent Organization" \ version="${RELEASE_VERSION}-debug" \ - author="Eduardo Silva " \ + author="Eduardo Silva " \ org.opencontainers.image.description="Fluent Bit debug container image" \ org.opencontainers.image.title="Fluent Bit Debug" \ org.opencontainers.image.licenses="Apache-2.0" \ @@ -199,7 +199,7 @@ LABEL description="Fluent Bit multi-architecture debug container image" \ org.opencontainers.image.version="${RELEASE_VERSION}-debug" \ org.opencontainers.image.source="https://github.com/fluent/fluent-bit" \ org.opencontainers.image.documentation="https://docs.fluentbit.io/" \ - org.opencontainers.image.authors="Eduardo Silva " + org.opencontainers.image.authors="Eduardo Silva " COPY --from=qemu-arm32 /usr/bin/qemu-arm-static /usr/bin/ COPY --from=qemu-arm64 /usr/bin/qemu-aarch64-static /usr/bin/ diff --git a/dockerfiles/Dockerfile.windows b/dockerfiles/Dockerfile.windows index 8ffefe78e55..da6ff079014 100644 --- a/dockerfiles/Dockerfile.windows +++ b/dockerfiles/Dockerfile.windows @@ -99,7 +99,7 @@ LABEL org.opencontainers.image.title="Fluent Bit" ` org.opencontainers.image.description="Fluent Bit is an open source and multi-platform Log Processor and Forwarder which allows you to collect data/logs from different sources, unify and send them to multiple destinations. It's fully compatible with Docker and Kubernetes environments." ` org.opencontainers.image.created=$IMAGE_CREATE_DATE ` org.opencontainers.image.version=$FLUENTBIT_VERSION ` - org.opencontainers.image.authors="Eduardo Silva " ` + org.opencontainers.image.authors="Eduardo Silva " ` org.opencontainers.image.url="https://hub.docker.com/r/fluent/fluent-bit" ` org.opencontainers.image.documentation="https://docs.fluentbit.io/manual/" ` org.opencontainers.image.vendor="Fluent Organization" ` From acdd29fef98ee70d4cfe752036067f76574093a1 Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Mon, 23 Sep 2024 12:53:32 +0100 Subject: [PATCH 2/2] Update with review comments Signed-off-by: Patrick Stephens --- MAINTAINERS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 3866eaef5c0..9a4a68f5a14 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -12,4 +12,4 @@ Fluent Bit is developed and supported by many individuals and companies. The fo | [Wesley Pettit](https://github.com/PettitWesley) | Amazon Plugins (AWS) | [Amazon Web Services](https://aws.amazon.com/) | | [Cedric Lamoriniere](https://github.com/clamoriniere) | Datadog Output Plugin | [Datadog](https://www.datadoghq.com/) | | [Jonathan Gonzalez V.](https://github.com/sxd) | PostgreSQL Output Plugin | [2ndQuadrant](https://www.2ndquadrant.com/en/) | -| [Jorge Niedbalski](https://github.com/niedbalski) | CI && Containers | [Chronosphere](https://chronosphere.io/) | +| [Jorge Niedbalski](https://github.com/niedbalski) | CI && Containers | [Personal Blog](https://niedbalski.dev/) |