Switch from fluentd to fluentbit for log forwarding (#1086)
This removes fluentd in favor of using fluentbit, which is lighter (in memory usage) and seems to be more actively maintained. Fluentbit's config file format is different from fluentd's. It also doesn't support the same record modification stuff that fluentd supports, so we have to change the influxdb query slightly. This means that after an upgrade, the new CLI may won't work for querying older logs. Hopefully, this slight breakage is acceptable; if users really need older logs they can use the older CLI.
This commit is contained in:
committed by
Ta-Ching Chen
parent
0fc864f230
commit
4e4c8aa14f
@@ -19,7 +19,6 @@ source $(dirname $0)/test_utils.sh
|
||||
|
||||
REPO=gcr.io/fission-ci
|
||||
IMAGE=fission-bundle
|
||||
FLUENTD_IMAGE=fluentd
|
||||
FETCHER_IMAGE=$REPO/fetcher
|
||||
BUILDER_IMAGE=$REPO/builder
|
||||
TAG=test
|
||||
@@ -46,8 +45,6 @@ build_and_push_env_builder python $REPO/python-env-builder:$TAG $BUILDER_IMAGE:$
|
||||
build_and_push_env_builder jvm $REPO/jvm-env-builder:$TAG $BUILDER_IMAGE:$TAG
|
||||
build_and_push_env_builder go $REPO/go-env-builder:$TAG $BUILDER_IMAGE:$TAG
|
||||
|
||||
build_and_push_fluentd $REPO/$FLUENTD_IMAGE:$TAG
|
||||
|
||||
build_fission_cli
|
||||
|
||||
install_and_test $REPO $IMAGE $TAG $FETCHER_IMAGE $TAG $FLUENTD_IMAGE $TAG $PRUNE_INTERVAL $ROUTER_SERVICE_TYPE $SERVICE_TYPE $PRE_UPGRADE_CHECK_IMAGE
|
||||
install_and_test $REPO $IMAGE $TAG $FETCHER_IMAGE $TAG $PRUNE_INTERVAL $ROUTER_SERVICE_TYPE $SERVICE_TYPE $PRE_UPGRADE_CHECK_IMAGE
|
||||
|
||||
+10
-27
@@ -107,19 +107,6 @@ build_and_push_builder() {
|
||||
popd
|
||||
}
|
||||
|
||||
build_and_push_fluentd(){
|
||||
image_tag=$1
|
||||
|
||||
pushd $ROOT/logger/fluentd
|
||||
docker build -q -t $image_tag .
|
||||
|
||||
gcloud_login
|
||||
|
||||
gcloud docker -- push $image_tag
|
||||
popd
|
||||
|
||||
}
|
||||
|
||||
build_and_push_env_runtime() {
|
||||
env=$1
|
||||
image_tag=$2
|
||||
@@ -183,17 +170,15 @@ helm_install_fission() {
|
||||
fetcherImageTag=$6
|
||||
controllerNodeport=$7
|
||||
routerNodeport=$8
|
||||
fluentdImage=$9
|
||||
fluentdImageTag=${10}
|
||||
pruneInterval="${11}"
|
||||
routerServiceType=${12}
|
||||
serviceType=${13}
|
||||
preUpgradeCheckImage=${14}
|
||||
pruneInterval=$9
|
||||
routerServiceType=${10}
|
||||
serviceType=${11}
|
||||
preUpgradeCheckImage=${12}
|
||||
|
||||
ns=f-$id
|
||||
fns=f-func-$id
|
||||
|
||||
helmVars=repository=$repo,image=$image,imageTag=$imageTag,fetcherImage=$fetcherImage,fetcherImageTag=$fetcherImageTag,functionNamespace=$fns,controllerPort=$controllerNodeport,routerPort=$routerNodeport,pullPolicy=Always,analytics=false,logger.fluentdImageRepository=$repo,logger.fluentdImage=$fluentdImage,logger.fluentdImageTag=$fluentdImageTag,pruneInterval=$pruneInterval,routerServiceType=$routerServiceType,serviceType=$serviceType,preUpgradeChecksImage=$preUpgradeCheckImage,prometheus.server.persistentVolume.enabled=false,prometheus.alertmanager.enabled=false,prometheus.kubeStateMetrics.enabled=false,prometheus.nodeExporter.enabled=false
|
||||
helmVars=repository=$repo,image=$image,imageTag=$imageTag,fetcherImage=$fetcherImage,fetcherImageTag=$fetcherImageTag,functionNamespace=$fns,controllerPort=$controllerNodeport,routerPort=$routerNodeport,pullPolicy=Always,analytics=false,pruneInterval=$pruneInterval,routerServiceType=$routerServiceType,serviceType=$serviceType,preUpgradeChecksImage=$preUpgradeCheckImage,prometheus.server.persistentVolume.enabled=false,prometheus.alertmanager.enabled=false,prometheus.kubeStateMetrics.enabled=false,prometheus.nodeExporter.enabled=false
|
||||
|
||||
timeout 30 bash -c "helm_setup"
|
||||
|
||||
@@ -495,12 +480,10 @@ install_and_test() {
|
||||
imageTag=$3
|
||||
fetcherImage=$4
|
||||
fetcherImageTag=$5
|
||||
fluentdImage=$6
|
||||
fluentdImageTag=$7
|
||||
pruneInterval=$8
|
||||
routerServiceType=$9
|
||||
serviceType=${10}
|
||||
preUpgradeCheckImage=${11}
|
||||
pruneInterval=$6
|
||||
routerServiceType=$7
|
||||
serviceType=$8
|
||||
preUpgradeCheckImage=$9
|
||||
|
||||
|
||||
controllerPort=31234
|
||||
@@ -510,7 +493,7 @@ install_and_test() {
|
||||
|
||||
id=$(generate_test_id)
|
||||
trap "helm_uninstall_fission $id" EXIT
|
||||
helm_install_fission $id $repo $image $imageTag $fetcherImage $fetcherImageTag $controllerPort $routerPort $fluentdImage $fluentdImageTag $pruneInterval $routerServiceType $serviceType $preUpgradeCheckImage
|
||||
helm_install_fission $id $repo $image $imageTag $fetcherImage $fetcherImageTag $controllerPort $routerPort $pruneInterval $routerServiceType $serviceType $preUpgradeCheckImage
|
||||
helm status $id | grep STATUS | grep -i deployed
|
||||
if [ $? -ne 0 ]; then
|
||||
describe_all_pods $id
|
||||
|
||||
@@ -75,7 +75,6 @@ upgrade_tests
|
||||
REPO=gcr.io/fission-ci
|
||||
IMAGE=fission-bundle
|
||||
FETCHER_IMAGE=$REPO/fetcher
|
||||
FLUENTD_IMAGE=gcr.io/fission-ci/fluentd
|
||||
BUILDER_IMAGE=$REPO/builder
|
||||
TAG=upgrade-test
|
||||
PRUNE_INTERVAL=1 # Unit - Minutes; Controls the interval to run archivePruner.
|
||||
@@ -85,15 +84,13 @@ build_and_push_fission_bundle $IMAGE:$TAG
|
||||
|
||||
build_and_push_fetcher $FETCHER_IMAGE:$TAG
|
||||
|
||||
build_and_push_fluentd $FLUENTD_IMAGE:$TAG
|
||||
|
||||
build_fission_cli
|
||||
|
||||
sudo mv $ROOT/fission/fission /usr/local/bin/
|
||||
|
||||
## Upgrade
|
||||
|
||||
helmVars=repository=$repo,image=$IMAGE,imageTag=$TAG,fetcherImage=$FETCHER_IMAGE,fetcherImageTag=$TAG,logger.fluentdImageRepository=$repo,logger.fluentdImage=$FLUENTD_IMAGE,logger.fluentdImageTag=$TAG,functionNamespace=$fns,controllerPort=$controllerNodeport,pullPolicy=Always,analytics=false,pruneInterval=$pruneInterval,routerServiceType=$routerServiceType
|
||||
helmVars=repository=$repo,image=$IMAGE,imageTag=$TAG,fetcherImage=$FETCHER_IMAGE,fetcherImageTag=$TAG,functionNamespace=$fns,controllerPort=$controllerNodeport,pullPolicy=Always,analytics=false,pruneInterval=$pruneInterval,routerServiceType=$routerServiceType
|
||||
|
||||
echo "Upgrading fission"
|
||||
helm upgrade \
|
||||
|
||||
Reference in New Issue
Block a user