From 2389c27f0314efe96e3bf8ca34056df820bdd17c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Bedn=C3=A1=C5=99?= Date: Wed, 31 Mar 2021 12:52:38 +0200 Subject: [PATCH] chore: update to Apache NiFi 1.13.2 (#48) --- CHANGELOG.md | 27 +++++++++-------- README.md | 2 +- pom.xml | 4 +-- scripts/Dockerfile | 2 +- scripts/flow.xml | 66 ++++++++++++++++++++--------------------- scripts/nifi-restart.sh | 2 +- 6 files changed, 53 insertions(+), 50 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74fca9e..f94d9fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,16 @@ ## v1.10.0 [unreleased] +### Others +* [48](https://github.com/influxdata/nifi-influxdb-bundle/pull/48): Update to Apache NiFi 1.13.2 + ## v1.9.0 [2021-03-05] ### Others -* [46](https://github.com/influxdata/nifi-influxdb-bundle/pull/46): Updated to Apache NiFi 1.13.0 +* [46](https://github.com/influxdata/nifi-influxdb-bundle/pull/46): Update to Apache NiFi 1.13.0 ### CI -* [#44](https://github.com/influxdata/nifi-influxdb-bundle/pull/44): Updated stable image to `influxdb:latest` -* [#45](https://github.com/influxdata/nifi-influxdb-bundle/pull/45): changed CI service from travis-ci.org to CircleCI +* [#44](https://github.com/influxdata/nifi-influxdb-bundle/pull/44): Update stable image to `influxdb:latest` +* [#45](https://github.com/influxdata/nifi-influxdb-bundle/pull/45): Change CI service from travis-ci.org to CircleCI ## v1.8.0 [2020-10-02] @@ -15,38 +18,38 @@ * [#36](https://github.com/influxdata/nifi-influxdb-bundle/pull/36): Default port changed from 9999 -> 8086 ### Others -* [38](https://github.com/influxdata/nifi-influxdb-bundle/pull/38): Updated NiFi to 1.12.1, InfluxDB v1 to 1.8, Chronograf to 1.7, influxdb-client-java to 1.11.0 and influxdb-java to 2.20 +* [38](https://github.com/influxdata/nifi-influxdb-bundle/pull/38): Update NiFi to 1.12.1, InfluxDB v1 to 1.8, Chronograf to 1.7, influxdb-client-java to 1.11.0 and influxdb-java to 2.20 ## v1.7.0 [2020-04-17] ### Others -* [32](https://github.com/influxdata/nifi-influxdb-bundle/pull/33): Updated to Apache NiFi 1.11.4 +* [32](https://github.com/influxdata/nifi-influxdb-bundle/pull/33): Update to Apache NiFi 1.11.4 ## v1.6.0 [2020-03-13] ### Others -* [32](https://github.com/influxdata/nifi-influxdb-bundle/pull/32): Updated to Apache NiFi 1.11.3 +* [32](https://github.com/influxdata/nifi-influxdb-bundle/pull/32): Update to Apache NiFi 1.11.3 ## v1.5.0 [2020-02-17] ### Others -* [31](https://github.com/influxdata/nifi-influxdb-bundle/pull/31): Updated to Apache NiFi 1.11.1 +* [31](https://github.com/influxdata/nifi-influxdb-bundle/pull/31): Update to Apache NiFi 1.11.1 ## v1.4 [2020-01-30] ### Others -* [30](https://github.com/influxdata/nifi-influxdb-bundle/pull/30): Updated to Apache NiFi 1.11.0 +* [30](https://github.com/influxdata/nifi-influxdb-bundle/pull/30): Update to Apache NiFi 1.11.0 ## v1.3 [2020-01-29] ### Others -* [27](https://github.com/influxdata/nifi-influxdb-bundle/pull/27): Updated to Apache NiFi 1.10.0 +* [27](https://github.com/influxdata/nifi-influxdb-bundle/pull/27): Update to Apache NiFi 1.10.0 ## v1.2 [2019-12-06] ### Features -* [23](https://github.com/influxdata/nifi-influxdb-bundle/issues/23): Added support for InfluxDB v2.0 +* [23](https://github.com/influxdata/nifi-influxdb-bundle/issues/23): Add support for InfluxDB v2.0 ## v1.1 [2019-06-06] @@ -56,8 +59,8 @@ * [20](https://github.com/influxdata/nifi-influxdb-bundle#putinfluxdatabase): PutInfluxDatabase supports the custom timestamp precision ### Others -* [11](https://github.com/influxdata/nifi-influxdb-bundle/issues/11): Updated to Apache NiFi 1.9.2 -* [12](https://github.com/influxdata/nifi-influxdb-bundle/issues/13): Updated to influxdb-java 2.15 +* [11](https://github.com/influxdata/nifi-influxdb-bundle/issues/11): Update to Apache NiFi 1.9.2 +* [12](https://github.com/influxdata/nifi-influxdb-bundle/issues/13): Update to influxdb-java 2.15 ## v1.0 [2019-02-21] diff --git a/README.md b/README.md index 2f6b85f..f3d5898 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ The Nar compatibility matrix: Nar Version | NiFi Version ----------------------------------------------------------------------------------------------------------------------------------------| ------------ -[nifi-influx-database-nar-1.10.0-SNAPSHOT.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.10.0-SNAPSHOT/nifi-influx-database-nar-1.10.0-SNAPSHOT.nar) | 1.13.0 +[nifi-influx-database-nar-1.10.0-SNAPSHOT.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.10.0-SNAPSHOT/nifi-influx-database-nar-1.10.0-SNAPSHOT.nar) | 1.13.2 [nifi-influx-database-nar-1.9.0.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.9.0/nifi-influx-database-nar-1.9.0.nar) | 1.13.0 [nifi-influx-database-nar-1.8.0.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.8.0/nifi-influx-database-nar-1.8.0.nar) | 1.12.1 [nifi-influx-database-nar-1.7.0.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.7.0/nifi-influx-database-nar-1.7.0.nar) | 1.11.4 diff --git a/pom.xml b/pom.xml index 1c81884..8a1b77f 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.nifi nifi-nar-bundles - 1.13.0 + 1.13.2 nifi-influx-database-bundle @@ -103,7 +103,7 @@ true - 1.13.0 + 1.13.2 2.22.0 0.8.2 diff --git a/scripts/Dockerfile b/scripts/Dockerfile index a9202ef..c451863 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -ARG NIFI_IMAGE=apache/nifi:1.13.0 +ARG NIFI_IMAGE=apache/nifi:1.13.2 FROM $NIFI_IMAGE diff --git a/scripts/flow.xml b/scripts/flow.xml index a256f0f..a0166ec 100644 --- a/scripts/flow.xml +++ b/scripts/flow.xml @@ -212,7 +212,7 @@ Set as Line Protocol. org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -245,7 +245,7 @@ Set as Line Protocol. org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -281,7 +281,7 @@ Set as Line Protocol. org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -382,7 +382,7 @@ Set as Line Protocol. org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -429,7 +429,7 @@ Set as Line Protocol. org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -468,7 +468,7 @@ Set as Line Protocol. org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -501,7 +501,7 @@ Set as Line Protocol. org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -537,7 +537,7 @@ Set as Line Protocol. org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -570,7 +570,7 @@ Set as Line Protocol. org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -657,7 +657,7 @@ Set as Line Protocol. org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -744,7 +744,7 @@ Set as Line Protocol. org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -780,7 +780,7 @@ Set as Line Protocol. org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -1190,7 +1190,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-http-context-map-nar - 1.13.0 + 1.13.2 true @@ -1210,7 +1210,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.13.0 + 1.13.2 true @@ -1286,7 +1286,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-http-context-map-nar - 1.13.0 + 1.13.2 true @@ -1306,7 +1306,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.13.0 + 1.13.2 true @@ -1343,7 +1343,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.13.0 + 1.13.2 true @@ -1438,7 +1438,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.13.0 + 1.13.2 true @@ -1507,7 +1507,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.13.0 + 1.13.2 true @@ -1655,7 +1655,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -1707,7 +1707,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-social-media-nar - 1.13.0 + 1.13.2 1 0 sec @@ -2042,7 +2042,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 5 sec @@ -2099,7 +2099,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -2151,7 +2151,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-kafka-1-0-nar - 1.13.0 + 1.13.2 1 0 sec @@ -2240,7 +2240,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-update-attribute-nar - 1.13.0 + 1.13.2 1 0 sec @@ -2398,7 +2398,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -2663,7 +2663,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.13.0 + 1.13.2 true @@ -2785,7 +2785,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.13.0 + 1.13.2 true @@ -2830,7 +2830,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-registry-nar - 1.13.0 + 1.13.2 true @@ -2872,7 +2872,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -2925,7 +2925,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -3073,7 +3073,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec @@ -3196,7 +3196,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.13.0 + 1.13.2 1 0 sec diff --git a/scripts/nifi-restart.sh b/scripts/nifi-restart.sh index d2c6da8..40bd794 100755 --- a/scripts/nifi-restart.sh +++ b/scripts/nifi-restart.sh @@ -23,7 +23,7 @@ DEFAULT_INFLUXDB_VERSION="1.8" INFLUXDB_VERSION="${INFLUXDB_VERSION:-$DEFAULT_INFLUXDB_VERSION}" INFLUXDB_IMAGE=influxdb:${INFLUXDB_VERSION}-alpine -DEFAULT_NIFI_VERSION="1.13.0" +DEFAULT_NIFI_VERSION="1.13.2" NIFI_VERSION="${NIFI_VERSION:-$DEFAULT_NIFI_VERSION}" NIFI_IMAGE=apache/nifi:${NIFI_VERSION}