From 5b4804de0e2ef174b8eed29a67349b01a638629f Mon Sep 17 00:00:00 2001 From: Xavier Beaudouin Date: Thu, 20 Feb 2025 10:15:18 +0100 Subject: [PATCH] Update --- sysutils/data-prepper/Makefile | 3 +- sysutils/data-prepper/pkg-plist | 167 ++++++++++++++++---------------- 2 files changed, 85 insertions(+), 85 deletions(-) diff --git a/sysutils/data-prepper/Makefile b/sysutils/data-prepper/Makefile index ebee8fe..3919ff9 100644 --- a/sysutils/data-prepper/Makefile +++ b/sysutils/data-prepper/Makefile @@ -44,9 +44,10 @@ do-install: .endfor #${MKDIR} ${STAGEDIR}${DATADIR}/examples ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/) ${MKDIR} ${STAGEDIR}${DATADIR}/lib ${MKDIR} ${STAGEDIR}${DATADIR}/pipelines - (cd ${WRKSRC}/ && ${COPYTREE_SHARE} "examples lib pipelines" ${STAGEDIR}${DATADIR}/) + (cd ${WRKSRC}/ && ${COPYTREE_SHARE} "lib pipelines" ${STAGEDIR}${DATADIR}/) ${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${DATADIR}/config .include diff --git a/sysutils/data-prepper/pkg-plist b/sysutils/data-prepper/pkg-plist index e4f618b..c333a46 100644 --- a/sysutils/data-prepper/pkg-plist +++ b/sysutils/data-prepper/pkg-plist @@ -3,89 +3,6 @@ etc/rc.d/data-prepper %%DATADIR%%/bin/data-prepper %%DATADIR%%/config -%%DATADIR%%/examples/adot/aws-ot-collector-config.yml -%%DATADIR%%/examples/adot/docker-compose.yml -%%DATADIR%%/examples/aws/README.md -%%DATADIR%%/examples/aws/jaeger-hotrod-on-ec2/README.md -%%DATADIR%%/examples/aws/jaeger-hotrod-on-ec2/setup-jaeger-hotrod.sh -%%DATADIR%%/examples/certificates/README.md -%%DATADIR%%/examples/certificates/default_certificate.pem -%%DATADIR%%/examples/certificates/default_private_key.pem -%%DATADIR%%/examples/certificates/openssl.conf -%%DATADIR%%/examples/config/README.md -%%DATADIR%%/examples/config/example-data-prepper-config.yaml -%%DATADIR%%/examples/config/example-pipelines.yaml -%%DATADIR%%/examples/config/pipelines-readme.txt -%%DATADIR%%/examples/data-prepper-config.yaml -%%DATADIR%%/examples/demo/demo-data-prepper.crt -%%DATADIR%%/examples/demo/demo-data-prepper.key -%%DATADIR%%/examples/demo/root-ca.pem -%%DATADIR%%/examples/demo/test_keystore.p12 -%%DATADIR%%/examples/dev/README.md -%%DATADIR%%/examples/dev/data-prepper-emf-monitoring/Dockerfile -%%DATADIR%%/examples/dev/data-prepper-emf-monitoring/README.md -%%DATADIR%%/examples/dev/data-prepper-emf-monitoring/data-prepper-config.yaml -%%DATADIR%%/examples/dev/data-prepper-emf-monitoring/data-prepper-emf-demo-cfn.yaml -%%DATADIR%%/examples/dev/data-prepper-emf-monitoring/docker-compose.yml -%%DATADIR%%/examples/dev/data-prepper-emf-monitoring/firelens-fluent-bit.conf -%%DATADIR%%/examples/dev/data-prepper-emf-monitoring/firelens.Dockerfile -%%DATADIR%%/examples/dev/data-prepper-emf-monitoring/fluent-bit.conf -%%DATADIR%%/examples/dev/data-prepper-emf-monitoring/pipelines-raw-trace-stdout.yaml -%%DATADIR%%/examples/dev/dns/Dockerfile -%%DATADIR%%/examples/dev/dns/dnsmasq.conf -%%DATADIR%%/examples/dev/dns/hosts.prepper -%%DATADIR%%/examples/dev/k8s/README.md -%%DATADIR%%/examples/dev/k8s/build_images_for_minikube.sh -%%DATADIR%%/examples/dev/k8s/data-prepper.yaml -%%DATADIR%%/examples/dev/k8s/sample-project-applications.yaml -%%DATADIR%%/examples/dev/trace-analytics-sample-app/Dockerfile -%%DATADIR%%/examples/dev/trace-analytics-sample-app/README.md -%%DATADIR%%/examples/dev/trace-analytics-sample-app/docker-compose.yml -%%DATADIR%%/examples/dev/trace-analytics-sample-app/images/grafana_metrics_sample.png -%%DATADIR%%/examples/dev/trace-analytics-sample-app/opentelemetry-collector/otel-collector-config.yml -%%DATADIR%%/examples/dev/trace-analytics-sample-app/prometheus/prometheus.yaml -%%DATADIR%%/examples/dev/trace-analytics-sample-app/resources/data-prepper-config.yaml -%%DATADIR%%/examples/dev/trace-analytics-sample-app/resources/data-prepper-wait-for-opensearch-and-start.sh -%%DATADIR%%/examples/dev/trace-analytics-sample-app/resources/pipelines.yaml -%%DATADIR%%/examples/jaeger-hotrod/README.md -%%DATADIR%%/examples/jaeger-hotrod/docker-compose.yml -%%DATADIR%%/examples/jaeger-hotrod/otel-collector-config.yml -%%DATADIR%%/examples/jaeger-hotrod/pipelines.yaml -%%DATADIR%%/examples/log-ingestion-ecs-firelens/README.md -%%DATADIR%%/examples/log-ingestion-ecs-firelens/example_log_pipeline.yaml -%%DATADIR%%/examples/log-ingestion-ecs-firelens/task-definition.json -%%DATADIR%%/examples/log-ingestion-fluentd/README.md -%%DATADIR%%/examples/log-ingestion-fluentd/docker-compose.yaml -%%DATADIR%%/examples/log-ingestion-fluentd/fluent.conf -%%DATADIR%%/examples/log-ingestion-k8s/K8-fluentbit-data-prepper.png -%%DATADIR%%/examples/log-ingestion-k8s/README.md -%%DATADIR%%/examples/log-ingestion-k8s/data-prepper-pipeline-config/example_log_pipeline.yaml -%%DATADIR%%/examples/log-ingestion-k8s/fluent-bit-01-ns.yaml -%%DATADIR%%/examples/log-ingestion-k8s/fluent-bit-02-service-account.yaml -%%DATADIR%%/examples/log-ingestion-k8s/fluent-bit-03-role-1.22.yaml -%%DATADIR%%/examples/log-ingestion-k8s/fluent-bit-04-role-binding-1.22.yaml -%%DATADIR%%/examples/log-ingestion-k8s/fluent-bit-05-configmap.yaml -%%DATADIR%%/examples/log-ingestion-k8s/fluent-bit-06-ds-minikube.yaml -%%DATADIR%%/examples/log-ingestion-k8s/my-app-01-ns.yaml -%%DATADIR%%/examples/log-ingestion-k8s/my-app-02-service.yaml -%%DATADIR%%/examples/log-ingestion-k8s/my-app-03-deployment.yaml -%%DATADIR%%/examples/log-ingestion/README.md -%%DATADIR%%/examples/log-ingestion/data-prepper-config.yaml -%%DATADIR%%/examples/log-ingestion/docker-compose-dataprepper.yaml -%%DATADIR%%/examples/log-ingestion/docker-compose.yaml -%%DATADIR%%/examples/log-ingestion/fluent-bit.conf -%%DATADIR%%/examples/log-ingestion/log_pipeline.yaml -%%DATADIR%%/examples/log-ingestion/test.log -%%DATADIR%%/examples/metrics-ingestion-otel/README.md -%%DATADIR%%/examples/metrics-ingestion-otel/docker-compose.yaml -%%DATADIR%%/examples/metrics-ingestion-otel/metric_pipeline.yaml -%%DATADIR%%/examples/metrics-ingestion-otel/otel-collector-config.yml -%%DATADIR%%/examples/trace_analytics.yml -%%DATADIR%%/examples/trace_analytics_no_ssl.yml -%%DATADIR%%/examples/trace_analytics_no_ssl_2x.yml -%%DATADIR%%/examples/zipkin-sleuth-webmvc-example/README.md -%%DATADIR%%/examples/zipkin-sleuth-webmvc-example/docker-compose.yml -%%DATADIR%%/examples/zipkin-sleuth-webmvc-example/otel-collector-config.yml %%DATADIR%%/lib/HdrHistogram-2.2.1.jar %%DATADIR%%/lib/LatencyUtils-2.0.3.jar %%DATADIR%%/lib/ST4-4.3.3.jar @@ -590,4 +507,86 @@ etc/rc.d/data-prepper %%DATADIR%%/lib/yasson-2.0.2.jar %%DATADIR%%/lib/zstd-jni-1.5.6-2.jar %%DATADIR%%/pipelines/README -%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/adot/aws-ot-collector-config.yml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/adot/docker-compose.yml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aws/README.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aws/jaeger-hotrod-on-ec2/README.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aws/jaeger-hotrod-on-ec2/setup-jaeger-hotrod.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/certificates/README.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/certificates/default_certificate.pem +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/certificates/default_private_key.pem +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/certificates/openssl.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/README.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/example-data-prepper-config.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/example-pipelines.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/pipelines-readme.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data-prepper-config.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/demo-data-prepper.crt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/demo-data-prepper.key +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/root-ca.pem +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/test_keystore.p12 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/README.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/data-prepper-emf-monitoring/Dockerfile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/data-prepper-emf-monitoring/README.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/data-prepper-emf-monitoring/data-prepper-config.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/data-prepper-emf-monitoring/data-prepper-emf-demo-cfn.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/data-prepper-emf-monitoring/docker-compose.yml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/data-prepper-emf-monitoring/firelens-fluent-bit.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/data-prepper-emf-monitoring/firelens.Dockerfile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/data-prepper-emf-monitoring/fluent-bit.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/data-prepper-emf-monitoring/pipelines-raw-trace-stdout.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/dns/Dockerfile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/dns/dnsmasq.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/dns/hosts.prepper +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/k8s/README.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/k8s/build_images_for_minikube.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/k8s/data-prepper.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/k8s/sample-project-applications.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/trace-analytics-sample-app/Dockerfile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/trace-analytics-sample-app/README.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/trace-analytics-sample-app/docker-compose.yml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/trace-analytics-sample-app/images/grafana_metrics_sample.png +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/trace-analytics-sample-app/opentelemetry-collector/otel-collector-config.yml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/trace-analytics-sample-app/prometheus/prometheus.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/trace-analytics-sample-app/resources/data-prepper-config.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/trace-analytics-sample-app/resources/data-prepper-wait-for-opensearch-and-start.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dev/trace-analytics-sample-app/resources/pipelines.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jaeger-hotrod/README.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jaeger-hotrod/docker-compose.yml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jaeger-hotrod/otel-collector-config.yml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jaeger-hotrod/pipelines.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-ecs-firelens/README.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-ecs-firelens/example_log_pipeline.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-ecs-firelens/task-definition.json +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-fluentd/README.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-fluentd/docker-compose.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-fluentd/fluent.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-k8s/K8-fluentbit-data-prepper.png +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-k8s/README.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-k8s/data-prepper-pipeline-config/example_log_pipeline.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-k8s/fluent-bit-01-ns.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-k8s/fluent-bit-02-service-account.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-k8s/fluent-bit-03-role-1.22.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-k8s/fluent-bit-04-role-binding-1.22.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-k8s/fluent-bit-05-configmap.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-k8s/fluent-bit-06-ds-minikube.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-k8s/my-app-01-ns.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-k8s/my-app-02-service.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion-k8s/my-app-03-deployment.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion/README.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion/data-prepper-config.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion/docker-compose-dataprepper.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion/docker-compose.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion/fluent-bit.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion/log_pipeline.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log-ingestion/test.log +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/metrics-ingestion-otel/README.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/metrics-ingestion-otel/docker-compose.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/metrics-ingestion-otel/metric_pipeline.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/metrics-ingestion-otel/otel-collector-config.yml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trace_analytics.yml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trace_analytics_no_ssl.yml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trace_analytics_no_ssl_2x.yml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zipkin-sleuth-webmvc-example/README.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zipkin-sleuth-webmvc-example/docker-compose.yml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zipkin-sleuth-webmvc-example/otel-collector-config.yml