linkedin · mcoGaia · Jan 6, 2016 · Dec 21, 2015 · Jan 29, 2016 · Jan 22, 2016
diff --git a/.gitignore b/.gitignore
@@ -17,12 +17,10 @@
 # general
 *~
 *.log
-dr_elephant.log.*
 tmp
 dump
 .history
 /*.iml
-/dr-elephant-*/
 /out
 
 # Eclipse
@@ -60,4 +58,4 @@ public/assets/ember/
 public/assets/fonts/
 web/bower_components/
 web/node_modules/
-web/package-lock.json
+*.class
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,15 @@
 language: scala
 sudo: true
 jdk:
-  - openjdk8
+  - oraclejdk8
+  - oraclejdk7
 python: "2.6"
 install:
   - sudo pip install inspyred
   - sudo pip install argparse
 
-script:
-  - ./travis.sh
-
-# only build PRs plus branches master and customSHSWork (not all branch pushes)
+# only build PRs and master (not all branch pushes)
 branches:
   only:
     - master
-    - customSHSWork
-
-env:
-  - PSO_DIR_PATH=$TRAVIS_BUILD_DIR/scripts/pso/
 
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@
 
 For more information on Dr. Elephant, check the wiki pages [here](https://github.com/linkedin/dr-elephant/wiki).
 
-For quick setup instructions: [Click here](https://github.com/linkedin/dr-elephant/wiki/Quick-Setup-Instructions-(Must-Read))
+For quick setup instructions: [Click here](https://github.com/linkedin/dr-elephant/wiki/Quick-Setup-Instructions)
 
 Developer guide: [Click here](https://github.com/linkedin/dr-elephant/wiki/Developer-Guide)
 
@@ -23,7 +23,7 @@ Engineering Blog: [Click here](https://engineering.linkedin.com/blog/2016/04/dr-
 
 ## Mailing-list & Github Issues
 
-~~Google groups mailing list: [Click here](https://groups.google.com/forum/#!forum/dr-elephant-users)~~ (Reached upper limit! please create github issues)
+Google groups mailing list: [Click here](https://groups.google.com/forum/#!forum/dr-elephant-users)
 
 Github issues: [click here](https://github.com/linkedin/dr-elephant/issues)
 
@@ -35,6 +35,100 @@ We have scheduled a weekly Dr. Elephant meeting for the interested developers an
 
 Check this [link](https://github.com/linkedin/dr-elephant/wiki/How-to-Contribute%3F).
 
+
+
+
+
+## How to compile and launch on Gaia3 from Thales gitlab
+1. Clone the project
+	* _git clone https://yourAccount@outils-communs-pastel.ts-tlse.fr/gitlab/GAIA/Dr-elephant.git_
+	* Update remote
+		* _git remote rename origin GAIA-repo_
+		* _git remote add linkedIn-repo https://github.com/linkedin/dr-elephant.git_
+
+2. Global variables
+	* Check the file "setEnv.txt" and type: _source setEnv.txt_
+	* Double check HTTP_PROXY & HTTPS_PROXY !
+
+3. Database
+	* Start the service mysql.
+	* Default account is drelephant with pwd = "Dr-elephant123"
+	* _mysql -u drelephant -p_ (or use root default account _musql -u root_)
+	* Create your account  or use default account.
+	    * To create your account connect as root.
+	    * _GRANT ALL PRIVILEGES ON \*.\* TO 'newUserName'@'localhost' IDENTIFIED BY 'newPassword' WITH GRANT OPTION;_
+	* Create a database or use default database (default datadase is "drelephant")
+	    * _use drelephant_ or _create database databaseName_
+    * Exit mysql prompt.
+
+4. Test the application
+    * go to $PROJECT_ROOT
+    * Type "_activator_" -> you are un Play framework prompt
+    * type command "_test_" -> all test are launched.	
+
+5. Compile
+ *	**<span style="color:red">Only for the First compilation</span>**
+ 	* _cd $PROJECT_ROOT/web_
+ 	* _npm install_
+ 	* _sed -i 's/https:\/\/bower.herokuapp.com/https:\/\/registry.bower.io/g' ./node_modules/bower/lib/node_modules/bower-config/lib/util/defaults.js_ 	
+ 	* _cd .._
+  * _./compile.sh compile.conf_
+  * The following warning must appear (only for the first compilation):
+DEPRECATION: You're using legacy binding syntax: valueBinding="newUser"
+For all others compilations this warning should not appear.
+
+* For all others compilations
+
+	* In compil.sh you can add or remove tests.
+		* Replace "play_command $OPTS clean compile dist"by "play_command $OPTS clean compile test dist"
+	* _./compile.sh compile.conf_
+	* The result of the compilation is stored in $PROJECT_ROOT/dist as a zip file
+
+6. Start & Stop
+	* After compilation:
+		* _cd dist/; unzip dr-elephant*.zip; cd dr-elephant*_
+		* Edit the following parameters in file app-conf/elephant.conf : port, db_url, db_name, db_user and db_password;
+	* Launch dr.Elephant -> 
+	    * ./bin/start.sh app-conf/ and go to localhost: "port" to use web UI.
+	* Stop dr.elephant
+	    * _./bin/stop_
+
+## Get the latest modification from linkedIn github on master branch
+1. Type the following command: git remote -v
+This should output something like:
+GAIA-repo       https://yourAccount@outils-communs-pastel.ts-tlse.fr/gitlab/GAIA/Dr-elephant.git (fetch)
+GAIA-repo       https://yourAccount@outils-communs-pastel.ts-tlse.fr/gitlab/GAIA/Dr-elephant.git (push)
+linkedIn-repo   https://github.com/linkedin/dr-elephant.git (fetch)
+linkedIn-repo   https://github.com/linkedin/dr-elephant.git (push)
+If not type:
+	* git remote rename origin GAIA-repo
+	* git remote add linkedIn-repo https://github.com/linkedin/dr-elephant.git
+
+2. Pull the project from github
+	* git pull linkedIn-repo master
+
+## Push modifications on Thales gitlab.
+* Update remote (or check file .git/config)
+	* git remote rename origin GAIA-repo
+	* git remote add linkedIn-repo https://github.com/linkedin/dr-elephant.git
+* Check all modified files: _git status_
+* Add all modified/untracked files to the staging area: _git add ._
+* Commit your modification: _git commit -m "message de commit"_
+* Push on remote repository: _git push -u GAIA-repo_
+
+## Tag a new version of Dr.elephant
+* Checkout on master branch: _git checkout master_
+* Create the tag: _git tag -a v1.0 -m "Version 1.0"_
+* Check that the tag is well created on local machine: _git tag_
+* Push the tag on remote: _git push GAIA-repo --tags_
+
+## Generate the delivery
+
+* Checkout the tag on a new branch: _git checkout tags/tagName -b branchName_
+* Check that the branch is well created: _git branch_
+* You can also check the last commit of the tag: _git log_
+* Generate the delivery: compile the project (you can follow steps 2 and 4 of part "How to compile and launch on Gaia3 from Thales gitlab")
+
 ## License
 
     Copyright 2016 LinkedIn Corp.

diff --git a/app-conf/AggregatorConf.xml b/app-conf/AggregatorConf.xml
@@ -44,8 +44,4 @@
       <allocated_memory_waste_buffer_percentage>0.5</allocated_memory_waste_buffer_percentage>
     </params>
   </aggregator>
-  <aggregator>
-    <applicationtype>tony</applicationtype>
-    <classname>com.linkedin.drelephant.tony.TonyMetricsAggregator</classname>
-  </aggregator>
 </aggregators>
diff --git a/app-conf/AutoTuningConf.xml b/app-conf/AutoTuningConf.xml
@@ -53,7 +53,7 @@
   </property>
   <property>
     <name>dr.elephant.api.url</name>
-    <value>http://localhost:8080</value>
+    <value>http://ltx1-holdemdre01.grid.linkedin.com:8080</value>
     <description>API URL for Dr Elephant. Optional. This is needed only if you are using APIFitnessComputeUtil to get
       fitness from Dr Elephant APIs
     </description>

diff --git a/app-conf/FetcherConf.xml b/app-conf/FetcherConf.xml
@@ -29,36 +29,43 @@
   </fetcher>
 -->
 <fetchers>
+
   <!--
      REST based fetcher for Tez jobs which pulls job metrics and data from Timeline Server API
    -->
+<!--
   <fetcher>
     <applicationtype>tez</applicationtype>
     <classname>com.linkedin.drelephant.tez.fetchers.TezFetcher</classname>
   </fetcher>
-  <!--
+-->
+
+
   <fetcher>
     <applicationtype>mapreduce</applicationtype>
     <classname>com.linkedin.drelephant.mapreduce.fetchers.MapReduceFetcherHadoop2</classname>
     <params>
       <sampling_enabled>false</sampling_enabled>
     </params>
   </fetcher>
-  -->
+
+
   <!--
      This is a replacement for the MapReduceFetcherHadoop2 that attempts to burn
      through queues of jobs faster by pulling data directly from HDFS rather than going through
      the job history server.
 
      Increasing the param history_log_size_limit_in_mb allows this fetcher to accept larger log
      files, but also increase the risk of OutOfMemory error. The default heap size of Dr. Elephant
+
      is 1024MB. To increase this, e.g. to 2048MB, update the below mem conf in app-conf/elephant.conf:
        jvm_args="-mem 2048"
 
      To work properly, this fetcher should use the same timezone with the job history server.
      If not set, the local timezone will be used.
    -->
 
+<!--
   <fetcher>
     <applicationtype>mapreduce</applicationtype>
     <classname>com.linkedin.drelephant.mapreduce.fetchers.MapReduceFSFetcherHadoop2</classname>
@@ -68,8 +75,10 @@
       <history_server_time_zone>PST</history_server_time_zone>
     </params>
   </fetcher>
+  -->
 
 
+
   <!--
     FSFetcher for Spark. Loads the eventlog from HDFS and replays to get the metrics and application properties
 
@@ -93,8 +102,7 @@
 
   <!--
   This is an experimental fetcher for Spark applications which uses SHS REST API to get application metrics
-  and WebHDFS to get application properties from eventlogs. Please note that this fetcher also supports backfill.
-  But backfill implementation in this fetcher relies upon SHS REST APIs' which are only available since Spark 2.3 
+  and WebHDFS to get application properties from eventlogs.
 
    <fetcher>
     <applicationtype>spark</applicationtype>
@@ -116,13 +124,4 @@
     </params>
   </fetcher>
   -->
-
-  <!--
-    Fetcher for TonY jobs. To use this, you must set the TONY_CONF_DIR environment variable to the directory
-    containing the tony-site.xml file.
-  -->
-  <!--fetcher>
-    <applicationtype>tony</applicationtype>
-    <classname>com.linkedin.drelephant.tony.fetchers.TonyFetcher</classname>
-  </fetcher-->
 </fetchers>
diff --git a/app-conf/GeneralConf.xml b/app-conf/GeneralConf.xml
@@ -45,30 +45,4 @@
     <name>drelephant.analysis.fetch.initial.windowMillis</name>
     <value>3600000</value>
   </property> -->
-  <property>
-    <name>drelephant.analysis.backfill.enabled</name>
-    <value>false</value>
-    <description>Enables or disables backfilling. Please note that merely enabling backfilling
-    does not ensure backfilling. Backfilling should also be implemented for the fetcher(s) configured.
-    </description>
-  </property>
-  <property>
-    <name>drelephant.analysis.backfill.retry.interval</name>
-    <value>60000</value>
-    <description>Time interval, in milliseconds, to wait before retrying backfill if it failed
-    during an earlier attempt.</description>
-  </property>
-  <property>
-    <name>drelephant.analysis.prioritization-on-job-query.max-wait-interval</name>
-    <value>60000</value>
-    <description>Maximum amount of time, in milliseconds, to wait for job information to appear in DB
-    and return a successful result with job info for a job which was queried using job REST endpoint
-    with prioritize query param set</description>
-  </property>
-  <property>
-    <name>drelephant.analysis.submit-backfill-job.with.low-priority</name>
-    <value>true</value>
-    <description>If this property is "true", it indicates that backfill job will be added to executor
-    for analysis with LOW priority. If "false", it will be submitted with NORMAL priority</description>
-  </property>
 </configuration>