search

mesosphere / universe

The Mesosphere Universe package repository.
http://mesosphere.github.io/universe
Apache License 2.0
306 stars 426 forks source link

Release nifi 1.2.0-1.12.0 (automated commit) #2610

Closed mesosphere-teamcity closed 3 years ago

mesosphere-teamcity commented 3 years ago

Release nifi 1.2.0-1.12.0 (automated commit)

Description: \

Source URL: https://infinity-artifacts.s3.amazonaws.com/permanent/nifi/assets/1.2.0-1.12.0/stub-universe-nifi.json

Changes between revisions 800 => 900: 0 files added: [] 0 files removed: [] 4 files changed:

--- 800/config.json
+++ 900/config.json
@@ -64,6 +64,27 @@
             }
           }
         },
+        "replacement_failure_policy": {
+          "description": "Replacement failure policy",
+          "type": "object",
+          "properties": {
+            "enable_automatic_pod_replacement": {
+              "description": "Replacement failure policy enabled",
+              "type": "boolean",
+              "default": false
+            },
+            "permanent_failure_timeout_secs": {
+              "description": "Permanent failure timeout in seconds",
+              "type": "integer",
+              "default": 120
+            },
+            "min_replace_delay_secs": {
+              "description": "Minimal replacement delay in seconds",
+              "type": "integer",
+              "default": 240
+            }
+          }
+        },
         "mesos_api_version": {
           "type": "string",
           "title": "Apache Mesos Scheduler API version [V0, V1]",
@@ -90,6 +111,22 @@
           ],
           "default": "INFO"
         },
+        "logrotate_options": {
+          "description": "The logrotate options for the DC/OS service.",
+          "type": "object",
+          "properties": {
+            "stdout_max_size": {
+              "description": "Logrotate stdout max size. Sizes must be an integer of less than 2^64 and must be suffixed with a unit such as B (bytes), KB, MB, GB, or TB. There should be no whitespace between the integer and unit.",
+              "type": "string",
+              "default": "8MB"
+            },
+            "stderr_max_size": {
+              "description": "Logrotate stderr max size. Sizes must be an integer of less than 2^64 and must be suffixed with a unit such as B (bytes), KB, MB, GB, or TB. There should be no whitespace between the integer and unit.",
+              "type": "string",
+              "default": "8MB"
+            }
+          }
+        },
         "placement_constraint": {
           "type": "string",
           "description": "Placement constraint for Nifi nodes. Example: [[\"hostname\", \"UNIQUE\"]]",
@@ -97,11 +134,6 @@
           "media": {
             "type": "application/x-zone-constraints+json"
           }
-        },
-        "metrics_frequency": {
-          "type": "integer",
-          "description": "Frequency for pushing metrics diagnostics to StatsD(in seconds)",
-          "default": 20
         },
         "deploy_strategy": {
           "enum": [
@@ -228,6 +260,32 @@
           "description": "NiFi Node Memory Requirements (in MB)",
           "default": 4096
         },
+        "external_volume": {
+          "type": "object",
+          "description": "The Nifi repository external volume configuration.\nOnly Portworx external volumes are supported.",
+          "properties": {
+            "enabled": {
+              "type": "boolean",
+              "description": "If true, external profile will be used.",
+              "default": false
+            },
+            "driver_name": {
+              "type": "string",
+              "default": "pxd",
+              "description": "External volume driver name."
+            },
+            "driver_options": {
+              "type": "string",
+              "default": "size=10",
+              "description": "Volume options."
+            },
+            "volume_name": {
+              "type": "string",
+              "description": "Volume name. If empty service path will be used.",
+              "default": ""
+            }
+          }
+        },
         "rlimit_nofile_soft": {
           "type": "integer",
           "title": "NiFi RLIMIT NOFILE Soft",
@@ -479,8 +537,7 @@
         "connect_string": {
           "type": "string",
           "title": "Connection String",
-          "description": "The Connect String that is needed to connect to Apache ZooKeeper. This is a comma-separated list of hostname:port pairs",
-          "default": "master.mesos:2181"
+          "description": "The Connect String that is needed to connect to Apache ZooKeeper. This is a comma-separated list of hostname:port pairs"
         },
         "connect_timeout": {
           "type": "string",
@@ -494,7 +551,10 @@
           "description": "How long to wait after losing a connection to ZooKeeper before the session is expired",
           "default": "3 secs"
         }
-      }
+      },
+      "required": [
+        "connect_string"
+      ]
     },
     "core": {
       "type": "object",
--- 800/marathon.json.mustache
+++ 900/marathon.json.mustache
@@ -4,15 +4,23 @@
   "mem": 1024,
   "instances": 1,
   "user": "{{service.user}}",
-  "cmd": "export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib:$LD_LIBRARY_PATH && export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so) && export JAVA_HOME=$(ls -d $MESOS_SANDBOX/jdk*/); export JAVA_HOME=${JAVA_HOME%/}; export PATH=$(ls -d $JAVA_HOME/bin):$PATH && export JAVA_OPTS=\"-Xms512M -Xmx512M -XX:-HeapDumpOnOutOfMemoryError\" && ./bootstrap -resolve=false -template=false && ./nifi-scheduler/bin/nifi ./nifi-scheduler/svc.yml",
+  "container": {
+    "type": "MESOS",
+    "docker": {
+      "image": "{{resource.assets.container.docker.scheduler}}",
+      "forcePullImage": true
+    }
+  },
+  "cmd": "chmod +x init.sh; ./init.sh",
   "labels": {
     "DCOS_COMMONS_API_VERSION": "v1",
     "DCOS_COMMONS_UNINSTALL": "true",
     "DCOS_PACKAGE_FRAMEWORK_NAME": "{{service.name}}",
     "MARATHON_SINGLE_INSTANCE_APP": "true",
     "DCOS_SERVICE_NAME": "{{service.name}}",
-    "DCOS_SERVICE_PORT_INDEX": "0",
-    "DCOS_SERVICE_SCHEME": "http"
+    "DCOS_SERVICE_SCHEME": "http",
+    "DCOS_SERVICE_PORT_INDEX": "1",
+    "DCOS_SERVICE_WEB_PATH": "/nifi"
   },
   {{#service.service_account_secret}}
   "secrets": {
@@ -23,15 +31,15 @@
   {{/service.service_account_secret}}
   "env": {
     "PACKAGE_NAME": "nifi",
-    "PACKAGE_VERSION": "1.0.1-1.9.2",
-    "PACKAGE_BUILD_TIME_EPOCH_MS": "1600370850513",
-    "PACKAGE_BUILD_TIME_STR": "Thu Sep 17 2020 19:27:30 +0000",
+    "PACKAGE_VERSION": "1.2.0-1.12.0",
+    "PACKAGE_BUILD_TIME_EPOCH_MS": "1605775511304",
+    "PACKAGE_BUILD_TIME_STR": "Thu Nov 19 2020 08:45:11 +0000",
     "FRAMEWORK_NAME": "{{service.name}}",
     "FRAMEWORK_USER": "{{service.user}}",
     "FRAMEWORK_PRINCIPAL": "{{service.service_account}}",
     "FRAMEWORK_LOG_LEVEL": "{{service.log_level}}",
     "FRAMEWORK_ZOOKEEPER": "master.mesos:2181",
-
+    "SERVICE_NAME": "{{service.name}}",
     "MESOS_API_VERSION": "{{service.mesos_api_version}}",

     "DEPLOY_STRATEGY": "{{service.deploy_strategy}}",
@@ -49,11 +57,12 @@
     "NIFI_API_ACCESS_JAR_URI": "{{resource.assets.uris.nifi-api-access-jar}}",
     "NIFI_PYHTON_URI": "{{resource.assets.uris.nifi-python-tar-gz}}",

-    "NIFI_VERSION": "1.9.2",
+    "NIFI_VERSION": "1.12.0",

     "BASE_NIFI_IMAGE" : "{{resource.assets.container.docker.nifi}}",

-    "CONFIG_TEMPLATE_PATH": "nifi-scheduler",
+    "CONTAINER_LOGGER_LOGROTATE_MAX_STDOUT_SIZE": "{{service.logrotate_options.stdout_max_size}}",
+    "CONTAINER_LOGGER_LOGROTATE_MAX_STDERR_SIZE": "{{service.logrotate_options.stderr_max_size}}",

     {{#service.service_account_secret}}
     "DCOS_SERVICE_ACCOUNT_CREDENTIAL": { "secret": "serviceCredential" },
@@ -84,6 +93,12 @@
     {{/secrets.enable}}
     {{/service.security.kerberos_tls.enable}}

+    {{#service.replacement_failure_policy.enable_automatic_pod_replacement}}
+    "ENABLE_AUTOMATIC_POD_REPLACEMENT": "{{service.replacement_failure_policy.enable_automatic_pod_replacement}}",
+    "PERMANENT_FAILURE_TIMEOUT_SECS": "{{service.replacement_failure_policy.permanent_failure_timeout_secs}}",
+    "MIN_REPLACE_DELAY_SECS": "{{service.replacement_failure_policy.min_replace_delay_secs}}",
+    {{/service.replacement_failure_policy.enable_automatic_pod_replacement}}
+
     "NODE_RLIMIT_NOFILE_SOFT": "{{node.rlimit_nofile_soft}}",
     "NODE_RLIMIT_NOFILE_HARD": "{{node.rlimit_nofile_hard}}",
     "NODE_RLIMIT_NPROC_SOFT": "{{node.rlimit_nproc_soft}}",
@@ -97,25 +112,22 @@
     "VIRTUAL_NETWORK_PLUGIN_LABELS": "{{service.virtual_network_plugin_labels}}",
     {{/service.virtual_network_enabled}}

-    "TASKCFG_ALL_NODE_CONTENT_REPOSITORY_PATH": "content-repository",
     "NODE_CONTENT_REPOSITORY_DISK_TYPE": "{{content.disk_type}}",
     "NODE_CONTENT_REPOSITORY_DISK_SIZE": "{{node.disk_size}}",
     {{#content.volume_profile}}
     "NODE_CONTENT_REPOSITORY_VOLUME_PROFILE": "{{content.volume_profile}}",
     {{/content.volume_profile}}

-    "TASKCFG_ALL_NODE_DATABASE_REPOSITORY_PATH": "database-repository",
+
     "NODE_DATABASE_REPOSITORY_DISK_TYPE": "{{node.disk_type}}",
     "NODE_DATABASE_REPOSITORY_DISK_SIZE": "{{node.disk_size}}",

-    "TASKCFG_ALL_NODE_FLOWFILE_REPOSITORY_PATH": "flowfile-repository",
     "NODE_FLOWFILE_REPOSITORY_DISK_TYPE": "{{flowfile.disk_type}}",
     "NODE_FLOWFILE_REPOSITORY_DISK_SIZE": "{{node.disk_size}}",
     {{#flowfile.volume_profile}}
     "NODE_FLOWFILE_REPOSITORY_VOLUME_PROFILE": "{{flowfile.volume_profile}}",
     {{/flowfile.volume_profile}}

-    "TASKCFG_ALL_NODE_PROVENANCE_REPOSITORY_PATH": "provenance-repository",
     "NODE_PROVENANCE_REPOSITORY_DISK_TYPE": "{{provenance.disk_type}}",
     "NODE_PROVENANCE_REPOSITORY_DISK_SIZE": "{{node.disk_size}}",
     {{#provenance.volume_profile}}
@@ -126,17 +138,21 @@
     "NODE_MISC_REPOSITORY_DISK_TYPE": "{{node.disk_type}}",
     "NODE_MISC_REPOSITORY_DISK_SIZE": "{{node.disk_size}}",

+    "TASKCFG_ALL_NODE_REPOSITORY_EXTERNAL_VOLUME_ENABLED": "{{node.external_volume.enabled}}",
+    "NODE_REPOSITORY_EXTERNAL_VOLUME_DRIVER_OPTIONS": "{{node.external_volume.driver_options}}",
+    "NODE_REPOSITORY_EXTERNAL_VOLUME_NAME": "{{node.external_volume.volume_name}}",
+    "NODE_EXTERNAL_VOLUME_DRIVER_NAME": "{{node.external_volume.driver_name}}",
+
     "TASKCFG_ALL_NIFI_KILL_GRACE_PERIOD": "{{node.kill_grace_period}}",
     "TASKCFG_ALL_NIFI_BOOTSTRAP_JVM_MIN": "{{node.nifi_bootstrap_jvm_min}}",
     "TASKCFG_ALL_NIFI_BOOTSTRAP_JVM_MAX": "{{node.nifi_bootstrap_jvm_max}}",
     "TASKCFG_ALL_NIFI_CN_DN_NODE_IDENTITY": "{{service.security.kerberos.cn_dn_node_identity}}",

     "TASKCFG_ALL_NIFI_FRAMEWORK_USER": "{{service.user}}",
-    "TASKCFG_ALL_NIFI_METRICS_FREQUENCY": "{{service.metrics_frequency}}",

     "NIFI_CLUSTER_NODE_PROTOCOL_PORT": "{{cluster.node_protocol_port}}",

-    "TASKCFG_ALL_NIFI_VERSION": "1.9.2",
+    "TASKCFG_ALL_NIFI_VERSION": "1.12.0",

     "TASKCFG_ALL_NIFI_CORE_FLOW_CONFIGURATION_ARCHIVE_ENABLED": "{{core.flow_configuration_archive_enabled}}",
@@ -158,6 +174,18 @@
     "TASKCFG_ALL_NIFI_CORE_ADDITIONAL_NAR_LIBRARY_PRESENT": "true",
     {{/core.additional_nar_lib}}

+    {{#node.external_volume.enabled}}
+    "TASKCFG_ALL_NIFI_DATABASE_REPOSITORY_DIRECTORY": "repository/database-repository",
+    "TASKCFG_ALL_NIFI_FLOWFILE_REPOSITORY_DIRECTORY": "repository/flowfile-repository",
+    "TASKCFG_ALL_NIFI_CONTENT_REPOSITORY_DIRECTORY": "repository/content-repository",
+    "TASKCFG_ALL_NIFI_PROVENANCE_REPOSITORY_DIRECTORY": "repository/provenance-repository",
+    {{/node.external_volume.enabled}}
+    {{^node.external_volume.enabled}}
+    "TASKCFG_ALL_NIFI_DATABASE_REPOSITORY_DIRECTORY": "database-repository",
+    "TASKCFG_ALL_NIFI_FLOWFILE_REPOSITORY_DIRECTORY": "flowfile-repository",
+    "TASKCFG_ALL_NIFI_CONTENT_REPOSITORY_DIRECTORY": "content-repository",
+    "TASKCFG_ALL_NIFI_PROVENANCE_REPOSITORY_DIRECTORY": "provenance-repository",
+    {{/node.external_volume.enabled}}

     "TASKCFG_ALL_NIFI_FLOWFILE_REPOSITORY_PARTITIONS": "{{flowfile.repository_partitions}}",
     "TASKCFG_ALL_NIFI_FLOWFILE_REPOSITORY_CHECKPOINT_INTERVAL": "{{flowfile.repository_checkpoint_interval}}",
@@ -293,7 +321,8 @@
     "{{resource.assets.uris.jre-tar-gz}}",
     "{{resource.assets.uris.scheduler-zip}}",
     "{{resource.assets.uris.libmesos-bundle-tar-gz}}",
-    "{{resource.assets.uris.bootstrap-zip}}"
+    "{{resource.assets.uris.bootstrap-zip}}",
+    "{{resource.assets.uris.init-sh}}"
   ],
   "upgradeStrategy":{
     "minimumHealthCapacity": 0,
@@ -316,6 +345,11 @@
       "protocol": "tcp",
       "name": "api",
       "labels": { "VIP_0": "/api.{{service.name}}:80" }
+    },
+    {
+      "port": 0,
+      "protocol": "tcp",
+      "name": "proxy"
     }
   ],
   "check": {
--- 800/package.json
+++ 900/package.json
@@ -1,14 +1,10 @@
 {
   "packagingVersion": "4.0",
-  "upgradesFrom": [
-    "1.0.0-1.9.2"
-  ],
-  "downgradesTo": [
-    "1.0.0-1.9.2"
-  ],
+  "upgradesFrom": [],
+  "downgradesTo": [],
   "minDcosReleaseVersion": "1.12",
   "name": "nifi",
-  "version": "1.0.1-1.9.2",
+  "version": "1.2.0-1.12.0",
   "maintainer": "support@mesosphere.io",
   "description": "Apache NiFi",
   "selected": true,
@@ -25,5 +21,5 @@
       "url": "https://github.com/apache/nifi/blob/master/LICENSE"
     }
   ],
-  "lastUpdated": 1600370851
+  "lastUpdated": 1605775511
 }--- 800/resource.json
+++ 900/resource.json
@@ -4,18 +4,20 @@
       "jre-tar-gz": "https://downloads.mesosphere.com/java/openjdk-jre-11.0.3.7-hotspot-linux-x64.tar.gz",
       "nifi-jre-tar-gz": "https://downloads.mesosphere.com/java/openjdk-jre-8u212b03-hotspot-linux-x64.tar.gz",
       "libmesos-bundle-tar-gz": "https://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.14-beta.tar.gz",
-      "bootstrap-zip": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.57.3/bootstrap.zip",
-      "scheduler-zip": "https://downloads.mesosphere.com/nifi/assets/1.0.1-1.9.2/nifi-scheduler.zip",
-      "nifi-tar-gz": "https://downloads.mesosphere.com/nifi/assets/nifi-1.9.2-bin.tar.gz",
-      "nifi-toolkit": "https://downloads.mesosphere.com/nifi/assets/nifi-toolkit-1.9.2-bin.tar.gz",
-      "nifi-janitor-jar": "https://downloads.mesosphere.com/nifi/assets/1.0.1-1.9.2/nifi-janitor.jar",
-      "nifi-statsd-jar": "https://downloads.mesosphere.com/nifi/assets/1.0.1-1.9.2/nifi-statsd.jar",
-      "nifi-api-access-jar": "https://downloads.mesosphere.com/nifi/assets/1.0.1-1.9.2/nifi-api-access.jar",
-      "nifi-python-tar-gz": "https://downloads.mesosphere.com/nifi/assets/python-2.7.14.tar.gz"
+      "bootstrap-zip": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.58.0/bootstrap.zip",
+      "scheduler-zip": "https://downloads.mesosphere.com/nifi/assets/1.2.0-1.12.0/nifi-scheduler.zip",
+      "nifi-tar-gz": "https://downloads.mesosphere.com/nifi/assets/nifi-1.12.0-bin.tar.gz",
+      "nifi-toolkit": "https://downloads.mesosphere.com/nifi/assets/nifi-toolkit-1.12.0-bin.tar.gz",
+      "nifi-janitor-jar": "https://downloads.mesosphere.com/nifi/assets/1.2.0-1.12.0/nifi-janitor.jar",
+      "nifi-statsd-jar": "https://downloads.mesosphere.com/nifi/assets/1.2.0-1.12.0/nifi-statsd.jar",
+      "nifi-api-access-jar": "https://downloads.mesosphere.com/nifi/assets/1.2.0-1.12.0/nifi-api-access.jar",
+      "nifi-python-tar-gz": "https://downloads.mesosphere.com/nifi/assets/python-2.7.14.tar.gz",
+      "init-sh": "https://downloads.mesosphere.com/nifi/assets/1.2.0-1.12.0/init.sh"
     },
     "container": {
       "docker": {
-        "nifi": "mesosphere/nifi:base-216572b1af441a2828fe50c144da6f2de59bb581c2baba2c0f0c894f162a5cc7"
+        "nifi": "mesosphere/nifi:base-216572b1af441a2828fe50c144da6f2de59bb581c2baba2c0f0c894f162a5cc7",
+        "scheduler": "mesosphere/nifi:scheduler-0.1"
       }
     }
   },
@@ -35,7 +37,7 @@
             }
           ],
           "kind": "executable",
-          "url": "https://downloads.mesosphere.com/nifi/assets/1.0.1-1.9.2/dcos-service-cli-darwin"
+          "url": "https://downloads.mesosphere.com/nifi/assets/1.2.0-1.12.0/dcos-service-cli-darwin"
         }
       },
       "linux": {
@@ -47,7 +49,7 @@
             }
           ],
           "kind": "executable",
-          "url": "https://downloads.mesosphere.com/nifi/assets/1.0.1-1.9.2/dcos-service-cli-linux"
+          "url": "https://downloads.mesosphere.com/nifi/assets/1.2.0-1.12.0/dcos-service-cli-linux"
         }
       },
       "windows": {
@@ -59,7 +61,7 @@
             }
           ],
           "kind": "executable",
-          "url": "https://downloads.mesosphere.com/nifi/assets/1.0.1-1.9.2/dcos-service-cli.exe"
+          "url": "https://downloads.mesosphere.com/nifi/assets/1.2.0-1.12.0/dcos-service-cli.exe"
         }
       }
     }