updated for HDF 1.1.2.0 (nifi 0.5.1) and HDP 2.4

README.md

@@ -3,7 +3,7 @@ Ambari service for easily installing and managing NiFi on HDP cluster and viewin
 
 Features:
 
-- By default, downloads the current GA version - HDF 1.1.1 package (nifi 0.4.1) - but also gives option to build the latest Nifi from source instead
+- By default, downloads the current GA version - HDF 1.1.2.0 package (nifi 0.5.1) - but also gives option to build the latest Nifi from source instead
 - Exposes nifi.properties, bootstrap.conf, logback.xml in Ambari UI (so you can configure port, memory, log dir etc)
 - Sets up initial flow.xml.gz that sets up Ambari reporting task to send Ambari metrics
 - Includes metrics widgets from [here](https://cwiki.apache.org/confluence/display/NIFI/Ambari+Metrics)
@@ -16,8 +16,8 @@ Authors:
 
 #### Option 1: Deploy Nifi on existing cluster
 
-- Download HDP 2.3 sandbox VM image (Sandbox_HDP_2.3_VMware.ova) from [Hortonworks website](http://hortonworks.com/products/hortonworks-sandbox/)
-- Import Sandbox_HDP_2.3_VMware.ova into VMWare and set the VM memory size to 8GB
+- Download HDP 2.4 sandbox VM image (Hortonworks_sanbox_with_hdp_2_4_vmware.ova) from [Hortonworks website](http://hortonworks.com/products/hortonworks-sandbox/)
+- Import Hortonworks_sanbox_with_hdp_2_4_vmware.ova into VMWare and set the VM memory size to 8GB
 - Now start the VM
 - After it boots up, find the IP address of the VM and add an entry into your machines hosts file. For example:
 ```
@@ -36,6 +36,7 @@ http://sandbox.hortonworks.com:8080
 - To download the NiFi service folder, run below
 ```
 VERSION=`hdp-select status hadoop-client | sed 's/hadoop-client - \([0-9]\.[0-9]\).*/\1/'`
+rm -rf /var/lib/ambari-server/resources/stacks/HDP/$VERSION/services/NIFI  
 sudo git clone https://github.com/abajwa-hw/ambari-nifi-service.git   /var/lib/ambari-server/resources/stacks/HDP/$VERSION/services/NIFI   
 ```
 
@@ -102,7 +103,7 @@ curl -sSL https://raw.githubusercontent.com/seanorama/ambari-bootstrap/master/am
 export install_ambari_server=true
 curl -sSL https://raw.githubusercontent.com/seanorama/ambari-bootstrap/master/ambari-bootstrap.sh | sudo -E sh
 yum install -y git
-sudo git clone https://github.com/abajwa-hw/ambari-nifi-service.git   /var/lib/ambari-server/resources/stacks/HDP/2.3/services/NIFI
+sudo git clone https://github.com/abajwa-hw/ambari-nifi-service.git   /var/lib/ambari-server/resources/stacks/HDP/2.4/services/NIFI
 ```
 
 - Restart Ambari
@@ -222,7 +223,7 @@ service ambari-server restart
 
   - HDP sandbox comes LW HDP search. Follow the steps below to use it to setup Banana, start SolrCloud and create a collection
 
-    - If running on an Ambari installed HDP 2.3 cluster (instead of sandbox), run the below to install HDPsearch first. These are not needed on sandbox.
+    - If running on an Ambari installed HDP 2.4 cluster (instead of sandbox), run the below to install HDPsearch first. These are not needed on sandbox.
 
   ```
   yum install -y lucidworks-hdpsearch

configuration/nifi-bootstrap-env.xml

@@ -83,6 +83,26 @@ java.arg.15=-Dambari.metrics.collector.url=http://{{metrics_collector_host}}:{{m
 #Application ID - used in flow.xml - passed into flow.xml for AmbariReportingTask 
 java.arg.16=-Dambari.application.id=nifi
 
+
+###
+# Notification Services for notifying interested parties when NiFi is stopped, started, dies
+###
+
+# XML File that contains the definitions of the notification services
+notification.services.file=./conf/bootstrap-notification-services.xml
+
+# In the case that we are unable to send a notification for an event, how many times should we retry?
+notification.max.attempts=5
+
+# Comma-separated list of identifiers that are present in the notification.services.file; which services should be used to notify when NiFi is started?
+#nifi.start.notification.services=email-notification
+
+# Comma-separated list of identifiers that are present in the notification.services.file; which services should be used to notify when NiFi is stopped?
+#nifi.stop.notification.services=email-notification
+
+# Comma-separated list of identifiers that are present in the notification.services.file; which services should be used to notify when NiFi dies?
+#nifi.dead.notification.services=email-notification
+
   </value>
   <description>Template for bootstrap.conf</description>
 

configuration/nifi-properties-env.xml

@@ -8,7 +8,7 @@
     <description>This is the jinja template for nifi.properties file</description>
     <value>      
 # Core Properties #
-nifi.version=0.3.0-SNAPSHOT
+nifi.version=0.5.1.1.1.2.0-32
 nifi.flow.configuration.file=./conf/flow.xml.gz
 nifi.flow.configuration.archive.dir=./conf/archive/
 nifi.flowcontroller.autoResumeState=true
@@ -26,6 +26,19 @@ nifi.nar.library.directory=./lib
 nifi.nar.working.directory=./work/nar/
 nifi.documentation.working.directory=./work/docs/components
 
+####################
+# State Management #
+####################
+nifi.state.management.configuration.file=./conf/state-management.xml
+# The ID of the local state provider
+nifi.state.management.provider.local=local-provider
+# The ID of the cluster-wide state provider. This will be ignored if NiFi is not clustered but must be populated if running in a cluster.
+nifi.state.management.provider.cluster=zk-provider
+# Specifies whether or not this instance of NiFi should run an embedded ZooKeeper server
+nifi.state.management.embedded.zookeeper.start=false
+# Properties file that provides the ZooKeeper properties to use if &lt;nifi.state.management.embedded.zookeeper.start&gt; is set to true
+nifi.state.management.embedded.zookeeper.properties=./conf/zookeeper.properties
+
 # H2 Settings
 nifi.database.directory=./database_repository
 nifi.h2.url.append=;LOCK_TIMEOUT=25000;WRITE_DELAY=0;AUTO_SERVER=FALSE

metainfo.xml

@@ -6,7 +6,7 @@
             <name>NIFI</name>
             <displayName>NiFi</displayName>
             <comment>Apache NiFi is an easy to use, powerful, and reliable system to process and distribute data.</comment>
-            <version>1.1.1</version>
+            <version>1.1.2.0</version>
             <components>
                 <component>
                   <name>NIFI_MASTER</name>

package/.hash

@@ -1 +1 @@
-19feb02cc7ffe729f566fe8ff4290ec54cc1adf1
+70e01a5cc69d191704f2a36d6039d80f9ab14897

package/scripts/master.py

@@ -19,8 +19,10 @@ def install(self, env):
     #snapshot_package='http://public-repo-1.hortonworks.com/HDF/1.0.0.0/nifi-1.0.0.0-7-bin.zip'
 
     #official HDF 1.1.1 package (nifi 0.4.1)
-    snapshot_package='http://public-repo-1.hortonworks.com/HDF/1.1.1.0/nifi-1.1.1.0-12-bin.zip'           
+    #snapshot_package='http://public-repo-1.hortonworks.com/HDF/1.1.1.0/nifi-1.1.1.0-12-bin.zip'           
 
+    snapshot_package='http://public-repo-1.hortonworks.com/HDF/1.1.2.0/nifi-0.5.1.1.1.2.0-32-bin.zip'
+
     #e.g. /var/lib/ambari-agent/cache/stacks/HDP/2.3/services/NIFI/package
     service_packagedir = os.path.realpath(__file__).split('/scripts')[0] 
 

package/scripts/params.py

@@ -12,8 +12,8 @@
 
 #nifi_dirname = 'nifi-0.3.0-SNAPSHOT'
 #nifi_dirname = 'nifi-0.3.0'
-nifi_dirname = 'nifi-1.1.1.0-12'
-
+#nifi_dirname = 'nifi-1.1.1.0-12'
+nifi_dirname = 'nifi-0.5.1.1.1.2.0-32' 
 
 # params from nifi-ambari-config
 nifi_install_dir = config['configurations']['nifi-ambari-config']['nifi.install_dir']