You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by mm...@apache.org on 2017/12/14 20:30:15 UTC

metron git commit: METRON-1345: Update EC2 README for custom Ansible (mmiklavc via mmiklavc) closes apache/metron#859

Repository: metron
Updated Branches:
  refs/heads/master d9ed1bad1 -> c4cee6af6


METRON-1345: Update EC2 README for custom Ansible (mmiklavc via mmiklavc) closes apache/metron#859


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/c4cee6af
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/c4cee6af
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/c4cee6af

Branch: refs/heads/master
Commit: c4cee6af64eda4db4da3eff86abab7d4ae4ec56a
Parents: d9ed1ba
Author: mmiklavc <mi...@gmail.com>
Authored: Thu Dec 14 13:29:49 2017 -0700
Committer: Michael Miklavcic <mi...@gmail.com>
Committed: Thu Dec 14 13:29:49 2017 -0700

----------------------------------------------------------------------
 metron-deployment/amazon-ec2/README.md                    | 10 ++++++++--
 .../roles/ambari_config/vars/small_cluster.yml            |  2 ++
 metron-interface/metron-rest/README.md                    |  8 ++++----
 3 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/metron/blob/c4cee6af/metron-deployment/amazon-ec2/README.md
----------------------------------------------------------------------
diff --git a/metron-deployment/amazon-ec2/README.md b/metron-deployment/amazon-ec2/README.md
index 7b8be93..82b7aeb 100644
--- a/metron-deployment/amazon-ec2/README.md
+++ b/metron-deployment/amazon-ec2/README.md
@@ -120,12 +120,18 @@ env: metron-test
 
 ### Selective Provisioning
 
-To provision only subsets of the entire Metron deployment, Ansible tags can be specified.  For example, to only deploy the sensors on an Amazon EC2 environment, run the following command.
+To provision only subsets of the entire Metron deployment, Ansible tags can be specified.  For example, to only deploy the sensors on an Amazon EC2 environment, run the following command:
 
 ```
-ansible-playbook -i ec2.py playbook.yml --tags "ec2,sensors"
+./run.sh --tags="ec2,sensors"
 ```
 
+### Setting REST API Profile
+
+By default, EC2 is deployed with the `dev` Spring profile. This simply instructs the REST API to automatically setup default test users `[user, user1, user2, admin]` with password "`password`" as opposed to requiring the user to manually
+ create users in the REST database. You can change this default functionality by removing the `metron_spring_profiles_active` setting in `metron-deployment/roles/ambari_config/vars/small_cluster.yml`.
+ You can view more detail on the REST Spring profiles [here](../../metron-interface/metron-rest/README.md#spring-profiles).
+
 ### Custom SSH Key
 
 

http://git-wip-us.apache.org/repos/asf/metron/blob/c4cee6af/metron-deployment/roles/ambari_config/vars/small_cluster.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/ambari_config/vars/small_cluster.yml b/metron-deployment/roles/ambari_config/vars/small_cluster.yml
index 6bdc0b4..1e652da 100644
--- a/metron-deployment/roles/ambari_config/vars/small_cluster.yml
+++ b/metron-deployment/roles/ambari_config/vars/small_cluster.yml
@@ -87,6 +87,8 @@ configurations:
       topology.classpath: '{{ topology_classpath }}'
   - kafka-broker:
       log.dirs: '{{ kafka_log_dirs | default("/kafka-log") }}'
+  - metron-rest-env:
+      metron_spring_profiles_active: "dev"
   - metron-env:
       parsers: "bro,snort,yaf"
   - elastic-site:

http://git-wip-us.apache.org/repos/asf/metron/blob/c4cee6af/metron-interface/metron-rest/README.md
----------------------------------------------------------------------
diff --git a/metron-interface/metron-rest/README.md b/metron-interface/metron-rest/README.md
index 4a16808..0cf58c0 100644
--- a/metron-interface/metron-rest/README.md
+++ b/metron-interface/metron-rest/README.md
@@ -180,10 +180,10 @@ The REST application comes with a few [Spring Profiles](http://docs.spring.io/au
 
 | Profile                  | Description                                   |
 | ------------------------ | --------------------------------------------- |
-| test                     | sets variables to in-memory services, only used for integration testing |
-| dev                      | adds a test user to the database with credentials `user/password`       |
-| vagrant                  | sets configuration variables to match the Metron vagrant environment    |
-| docker                   | sets configuration variables to match the Metron docker environment     |
+| test                     | adds test users `[user, user1, user2, admin]` to the database with password "`password`". sets variables to in-memory services, only used for integration testing |
+| dev                      | adds test users `[user, user1, user2, admin]` to the database with password "`password`" |
+| vagrant                  | sets configuration variables to match the Metron vagrant environment |
+| docker                   | sets configuration variables to match the Metron docker environment |
 
 Setting active profiles is done with the METRON_SPRING_PROFILES_ACTIVE variable.  For example, set this variable in `/etc/default/metron` to configure the REST application for the Vagrant environment and add a test user:
 ```