Merge pull request #68 from cetic/develop

Develop

.all-contributorsrc

@@ -7,7 +7,7 @@
   "contributors": [
     {
       "login": "banzo",
-      "name": "banzo",
+      "name": "Sebastien Dupont",
       "avatar_url": "https://avatars1.githubusercontent.com/u/2684865?v=4",
       "profile": "https://github.com/banzo",
       "contributions": [
@@ -28,7 +28,7 @@
     },
     {
       "login": "AyadiAmen",
-      "name": "Amen",
+      "name": "Amen Ayadi",
       "avatar_url": "https://avatars1.githubusercontent.com/u/37482206?v=4",
       "profile": "https://github.com/AyadiAmen",
       "contributions": [
@@ -57,7 +57,7 @@
     },
     {
       "login": "smouton-cetic",
-      "name": "smouton-cetic",
+      "name": "Stephane Mouton",
       "avatar_url": "https://avatars3.githubusercontent.com/u/52540999?v=4",
       "profile": "https://github.com/smouton-cetic",
       "contributions": [
@@ -66,7 +66,7 @@
     },
     {
       "login": "nikosmtsk",
-      "name": "nikosmtsk",
+      "name": "Nikolaos Matskanis",
       "avatar_url": "https://avatars1.githubusercontent.com/u/36480172?v=4",
       "profile": "https://github.com/nikosmtsk",
       "contributions": [
@@ -75,16 +75,17 @@
     },
     {
       "login": "Sellto",
-      "name": "Sellto",
+      "name": "Tom Selleslagh",
       "avatar_url": "https://avatars1.githubusercontent.com/u/17011743?v=4",
       "profile": "https://github.com/Sellto",
       "contributions": [
-        "doc"
+        "doc",
+        "test"
       ]
     },
     {
       "login": "terence-bigtt",
-      "name": "terence-bigtt",
+      "name": "Terence Delsate",
       "avatar_url": "https://avatars1.githubusercontent.com/u/15094829?v=4",
       "profile": "https://github.com/terence-bigtt",
       "contributions": [
@@ -93,7 +94,7 @@
     },
     {
       "login": "Maher-badri",
-      "name": "Maher-badri",
+      "name": "Maher Badri",
       "avatar_url": "https://avatars0.githubusercontent.com/u/52699999?v=4",
       "profile": "https://github.com/Maher-badri",
       "contributions": [
@@ -111,15 +112,15 @@
     },
     {
       "login": "SellamiRami",
-      "name": "SellamiRami",
+      "name": "Rami Sellami",
       "avatar_url": "https://avatars0.githubusercontent.com/u/3645720?v=4",
       "profile": "https://github.com/SellamiRami",
       "contributions": [
         "review"
       ]
     }
   ],
-  "contributorsPerLine": 7,
+  "contributorsPerLine": 6,
   "projectName": "fadi",
   "projectOwner": "cetic",
   "repoType": "github",

FAQ.md

@@ -6,13 +6,13 @@ FAQ - Frequently asked questions
 * a minimal setup can run on your laptop using minikube (see [the local deployment](https://github.com/cetic/fadi#02-local-deployment). Currently 16GB RAM with a modern CPU should be sufficient.
 * if you have an account at a public cloud that provides Kubernetes as a service (AWS, GCP, Azure, ...), or have a Kubernetes cluster at hand, you can install the stack using our Helm template. (see [GKE instructions](https://github.com/cetic/fadi#04-deployment-on-gke))
 
-## How can I get help on how to use FADI
+## How can I get help on how to use FADI?
 
 In case you encounter an issue with FADI, have a feature request or any other question, feel free to [open an issue](https://github.com/cetic/fadi/issues/new/choose).
 
 ## Why "FADI"?
 
-FADI is the acronym for "Framework d'Analyse de Données Industrielles" ("A Framework for Industrial Data Analysis"))
+FADI is the acronym for "Framework d'Analyse de Données Industrielles" ("A Framework for Industrial Data Analysis")
 
 ## FADI is not working
 

README.md

@@ -1,5 +1,5 @@
 # FADI - A framework for big data analytics
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![version](https://img.shields.io/github/tag/cetic/fadi.svg?label=release) [![All Contributors](https://img.shields.io/badge/all_contributors-12-orange.svg?style=flat-square)](#contributors)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![version](https://img.shields.io/github/tag/cetic/fadi.svg?label=release) [![All Contributors](https://img.shields.io/badge/all_contributors-10-orange.svg?style=flat)](#contributors)
 
 <p align="center" style="width: 50%; height: 200px;">
   <a href="https://fadi.cetic.be"><img src="doc/images/logo.png" height="200"/></a>
@@ -31,7 +31,7 @@ This [repository](https://github.com/cetic/helm-fadi) contains the Helm chart to
 
 In case you encounter an issue with FADI, have a feature request or any other question, feel free to [open an issue](https://github.com/cetic/fadi/issues/new/choose).
 
-See also [the FAQ](FAQ.md)!
+Feel also free to check out [the FAQ](FAQ.md)!
 
 ## Contributors
 
@@ -41,42 +41,29 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <!-- prettier-ignore -->
 <table>
   <tr>
-    <td align="center"><a href="https://github.com/banzo"><img src="https://avatars1.githubusercontent.com/u/2684865?v=4" width="100px;" alt="banzo"/><br /><sub><b>banzo</b></sub></a><br /><a href="https://github.com/cetic/fadi/commits?author=banzo" title="Code">💻</a> <a href="#review-banzo" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/banzo"><img src="https://avatars1.githubusercontent.com/u/2684865?v=4" width="100px;" alt="banzo"/><br /><sub><b>Sebastien Dupont</b></sub></a><br /><a href="https://github.com/cetic/fadi/commits?author=banzo" title="Code">💻</a> <a href="#review-banzo" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/alexandre-nuttinck/"><img src="https://avatars1.githubusercontent.com/u/17699324?v=4" width="100px;" alt="Alexandre Nuttinck"/><br /><sub><b>Alexandre Nuttinck</b></sub></a><br /><a href="https://github.com/cetic/fadi/commits?author=alexnuttinck" title="Code">💻</a> <a href="#review-alexnuttinck" title="Reviewed Pull Requests">👀</a> <a href="#infra-alexnuttinck" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
-    <td align="center"><a href="https://github.com/AyadiAmen"><img src="https://avatars1.githubusercontent.com/u/37482206?v=4" width="100px;" alt="Amen"/><br /><sub><b>Amen</b></sub></a><br /><a href="https://github.com/cetic/fadi/commits?author=AyadiAmen" title="Code">💻</a> <a href="#design-AyadiAmen" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/AyadiAmen"><img src="https://avatars1.githubusercontent.com/u/37482206?v=4" width="100px;" alt="Amen"/><br /><sub><b>Amen Ayadi</b></sub></a><br /><a href="https://github.com/cetic/fadi/commits?author=AyadiAmen" title="Code">💻</a> <a href="#design-AyadiAmen" title="Design">🎨</a></td>
     <td align="center"><a href="https://sites.google.com/site/faiezzalila/"><img src="https://avatars2.githubusercontent.com/u/2330030?v=4" width="100px;" alt="Faiez Zalila"/><br /><sub><b>Faiez Zalila</b></sub></a><br /><a href="https://github.com/cetic/fadi/commits?author=fzalila" title="Code">💻</a> <a href="https://github.com/cetic/fadi/commits?author=fzalila" title="Tests">⚠️</a></td>
     <td align="center"><a href="https://github.com/FabianSteels"><img src="https://avatars3.githubusercontent.com/u/6490581?v=4" width="100px;" alt="Fabian Steels"/><br /><sub><b>Fabian Steels</b></sub></a><br /><a href="#ideas-FabianSteels" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/smouton-cetic"><img src="https://avatars3.githubusercontent.com/u/52540999?v=4" width="100px;" alt="smouton-cetic"/><br /><sub><b>smouton-cetic</b></sub></a><br /><a href="#projectManagement-smouton-cetic" title="Project Management">📆</a></td>
-    <td align="center"><a href="https://github.com/nikosmtsk"><img src="https://avatars1.githubusercontent.com/u/36480172?v=4" width="100px;" alt="nikosmtsk"/><br /><sub><b>nikosmtsk</b></sub></a><br /><a href="#projectManagement-nikosmtsk" title="Project Management">📆</a></td>
+    <td align="center"><a href="https://github.com/smouton-cetic"><img src="https://avatars3.githubusercontent.com/u/52540999?v=4" width="100px;" alt="smouton-cetic"/><br /><sub><b>Stephane Mouton</b></sub></a><br /><a href="#projectManagement-smouton-cetic" title="Project Management">📆</a></td>
+    <td align="center"><a href="https://github.com/nikosmtsk"><img src="https://avatars1.githubusercontent.com/u/36480172?v=4" width="100px;" alt="nikosmtsk"/><br /><sub><b>Nikolaos Matskanis</b></sub></a><br /><a href="#projectManagement-nikosmtsk" title="Project Management">📆</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://github.com/Sellto"><img src="https://avatars1.githubusercontent.com/u/17011743?v=4" width="100px;" alt="Sellto"/><br /><sub><b>Sellto</b></sub></a><br /><a href="https://github.com/cetic/fadi/commits?author=Sellto" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/terence-bigtt"><img src="https://avatars1.githubusercontent.com/u/15094829?v=4" width="100px;" alt="terence-bigtt"/><br /><sub><b>terence-bigtt</b></sub></a><br /><a href="https://github.com/cetic/fadi/commits?author=terence-bigtt" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/Maher-badri"><img src="https://avatars0.githubusercontent.com/u/52699999?v=4" width="100px;" alt="Maher-badri"/><br /><sub><b>Maher-badri</b></sub></a><br /><a href="#projectManagement-Maher-badri" title="Project Management">📆</a></td>
+    <td align="center"><a href="https://github.com/Sellto"><img src="https://avatars1.githubusercontent.com/u/17011743?v=4" width="100px;" alt="Sellto"/><br /><sub><b>Tom Selleslagh</b></sub></a><br /><a href="https://github.com/cetic/fadi/commits?author=Sellto" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/terence-bigtt"><img src="https://avatars1.githubusercontent.com/u/15094829?v=4" width="100px;" alt="terence-bigtt"/><br /><sub><b>Terence Delsate</b></sub></a><br /><a href="https://github.com/cetic/fadi/commits?author=terence-bigtt" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Maher-badri"><img src="https://avatars0.githubusercontent.com/u/52699999?v=4" width="100px;" alt="Maher-badri"/><br /><sub><b>Maher Badri</b></sub></a><br /><a href="#projectManagement-Maher-badri" title="Project Management">📆</a></td>
     <td align="center"><a href="https://github.com/mgoeminne"><img src="https://avatars1.githubusercontent.com/u/1286106?v=4" width="100px;" alt="Mathieu Goeminne"/><br /><sub><b>Mathieu Goeminne</b></sub></a><br /><a href="#ideas-mgoeminne" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/SellamiRami"><img src="https://avatars0.githubusercontent.com/u/3645720?v=4" width="100px;" alt="SellamiRami"/><br /><sub><b>SellamiRami</b></sub></a><br /><a href="#review-SellamiRami" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/SellamiRami"><img src="https://avatars0.githubusercontent.com/u/3645720?v=4" width="100px;" alt="SellamiRami"/><br /><sub><b>Rami Sellami</b></sub></a><br /><a href="#review-SellamiRami" title="Reviewed Pull Requests">👀</a><a href="https://github.com/cetic/fadi/commits?author=SellamiRami" title="Tests">⚠️</a></td>
   </tr>
 </table>
 
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! (see the [contributions guidelines](CONTRIBUTING.md))
 
-## Thanks
-
-This project has been realised in the context of the following research projects:
-
-<table style="border:none;" width="100%">
-    <tr>
-      <td style="text-align: center; vertical-align: middle;" align="center"><a href="https://www.bigdata-ma.eu/"><img alt="BigDataAtMa" src="doc/images/logos/bigdataatma.png" height="50"></a></td>
-      <td style="text-align: center; vertical-align: middle;" align="center"><a href="https://www.cetic.be/Nouvelle-traduction-GRINDING-4-0"><img alt="Grinding 4.0" src="doc/images/logos/grinding.jpg" height="50"></a></td>
-      <td style="text-align: center; vertical-align: middle;" align="center"><a href="http://newtech4steel.eu/"><img alt="Presentation slides" src="doc/images/logos/nt4s.png" height="50"></a></td>
-      <td style="text-align: center; vertical-align: middle;" align="center"><a href="https://www.quality-40.eu/"><img alt="FAQ" src="doc/images/logos/quality40.png" height="50"></a></td>
-    </tr>
-    <tr>
-      <td style="text-align: center; vertical-align: middle;" align="center"><a href="https://www.bigdata-ma.eu/">Bigdata@MA</a> - Big Data application at MAnufacturing industry</td>
-      <td style="text-align: center; vertical-align: middle;" align="center"><a href="https://www.cetic.be/Nouvelle-traduction-GRINDING-4-0">Grinding 4.0</a> - Smart 4.0 machine cell model for automotive cutting tool grinding services</td>
-      <td style="text-align: center; vertical-align: middle;" align="center"><a href="http://newtech4steel.eu/">NewTech4Steel</a> - New technologies for real-time monitoring and control of steel production</td>
-      <td style="text-align: center; vertical-align: middle;" align="center"><a href="https://www.quality-40.eu/">Quality 4.0</a> - Transparent product quality supervision in the age of Industry 4.0</td>
-    </tr>
-</table>
+## About
+
+<a href="https://cetic.be/FADI"><img src="doc/images/logos/cetic.png" height="100"/></a>
+
+You can find out more about FADI on the [CETIC website](https://cetic.be/FADI)