You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@metron.apache.org by justinleet <gi...@git.apache.org> on 2018/05/30 13:55:21 UTC

[GitHub] metron pull request #1037: METRON-1547: Solr Comment Fields

GitHub user justinleet opened a pull request:

    https://github.com/apache/metron/pull/1037

    METRON-1547: Solr Comment Fields

    ## Contributor Comments
    Adding support for comments on Alerts in Solr.  Nested objects are absurdly painful, so this follows the ES expectation of these not needing to be queryable.
    
    Solr doesn't have a great way to store these as-is, so they're stored as raw JSON, which is converted appropriately to ensure everything sees the same data as in the ES case.
    
    The REST API has been adjusted to have add/remove comment calls, rather than just patching (since that won't work in Solr directly). However, index is required to avoid an error for Solr right now as a result of METRON-1585.  Once that is fixed, index will be optional.
    
    There are currently a couple bugs that I would love some help with.
    
    -  In ES, when you add a comment, it doesn't immediately show up on the comments list.  It looks like a findOne is fired off, but I assume ES isn't updated yet.  This doesn't appear to happen in Solr.
    - When I hit delete on a comment in the UI (at least in Solr, unsure about ES), the comment is visually removed, but no remove request is fired off. I assume I have something misaligned, but I'm not sure what.
    - I patterned the optional index off of findOne, because it handles it a bit specially.  Delightfully, now I have an extra indexString field showing up in both findOne and the add remove comment.  There's some JsonGetter annotation thing I'm probably not using correctly.
    
    To test,
    This can be tested both via REST and the UI.  As noted above, at least right now the UI has more instability associated with it.
    
    ## Pull Request Checklist
    
    Thank you for submitting a contribution to Apache Metron.  
    Please refer to our [Development Guidelines](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61332235) for the complete guide to follow for contributions.  
    Please refer also to our [Build Verification Guidelines](https://cwiki.apache.org/confluence/display/METRON/Verifying+Builds?show-miniview) for complete smoke testing guides.  
    
    
    In order to streamline the review of the contribution we ask you follow these guidelines and ask you to double check the following:
    
    ### For all changes:
    - [x] Is there a JIRA ticket associated with this PR? If not one needs to be created at [Metron Jira](https://issues.apache.org/jira/browse/METRON/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel).
    - [x] Does your PR title start with METRON-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
    - [x] Has your PR been rebased against the latest commit within the target branch (typically master)?
    
    
    ### For code changes:
    - [ ] Have you included steps to reproduce the behavior or problem that is being changed or addressed?
    - [ ] Have you included steps or a guide to how the change may be verified and tested manually?
    - [ ] Have you ensured that the full suite of tests and checks have been executed in the root metron folder via:
      ```
      mvn -q clean integration-test install && dev-utilities/build-utils/verify_licenses.sh 
      ```
    
    - [x] Have you written or updated unit tests and or integration tests to verify your changes?
    - [x] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
    - [ ] Have you verified the basic functionality of the build by building and running locally with Vagrant full-dev environment or the equivalent?
    
    ### For documentation related changes:
    - [ ] Have you ensured that format looks appropriate for the output in which it is rendered by building and verifying the site-book? If not then run the following commands and the verify changes via `site-book/target/site/index.html`:
    
      ```
      cd site-book
      mvn site
      ```
    
    #### Note:
    Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.
    It is also recommended that [travis-ci](https://travis-ci.org) is set up for your personal repository such that your branches are built there before submitting a pull request.


You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/justinleet/metron solrCommentsBlob

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/metron/pull/1037.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #1037
    
----
commit bc44653102f9f628ae23fee1309048dbc07ca0b8
Author: justinjleet <ju...@...>
Date:   2018-05-09T19:54:57Z

    Mostly working

commit 1778a6941b861fafb4b67e188323bd13d5e9df8b
Author: justinjleet <ju...@...>
Date:   2018-05-14T00:49:31Z

    Fixing error message

commit b7eb68012a07c1c8c045012e8abfdfc7dc11e55b
Author: justinjleet <ju...@...>
Date:   2018-05-14T02:43:34Z

    Fixing multiindexdao to grab latest before delegating to avoid hbase sadness

commit 3ce28390c11fe5e7d7355eab4c57dffa1004f6e9
Author: justinjleet <ju...@...>
Date:   2018-05-14T11:45:14Z

    fixing concurrent mod problem

commit 0b48179a8599888d3d4a8aafa848cf3c0d891f3b
Author: justinjleet <ju...@...>
Date:   2018-05-14T11:57:01Z

    Fixing schema tests to handle new field

commit 45212df8879f5a400262b715a1a1aef828397028
Author: justinjleet <ju...@...>
Date:   2018-05-14T20:31:07Z

    reverting es pom from testing

commit ea504dca9d2c5475d4753f974a08c65a0f5fa26e
Author: justinjleet <ju...@...>
Date:   2018-05-14T21:27:04Z

    testing UI changes to rest api

commit d0f202b127f5aa1d6d718184d57b8d676d93a5d5
Author: justinjleet <ju...@...>
Date:   2018-05-18T12:25:51Z

    testing ui changes

commit 7aaa63d9ccbb8896ecfc95be50b29cf4fa09851f
Author: justinjleet <ju...@...>
Date:   2018-05-23T10:47:04Z

    merge from feature/METRON-1416-upgrade-solr

commit 1d7347b71d8e0151f0152608fb39e0e80813d0b5
Author: justinjleet <ju...@...>
Date:   2018-05-23T14:17:51Z

    working on fixing patch

commit b4649fa26b0bd44eb23670783f781bea43aa7512
Author: justinjleet <ju...@...>
Date:   2018-05-23T17:57:08Z

    fixing plus logging

commit 1867c8d8553a07dd42d3f90609076dbe3c6ae0ed
Author: justinjleet <ju...@...>
Date:   2018-05-29T23:30:48Z

    variety of fixes post merge and race condition fix

commit 4e592d7ad63711fce2f3c3c1e7f48df1f228538b
Author: justinjleet <ju...@...>
Date:   2018-05-30T11:57:34Z

    stray println

commit 21b87f345e783baaeb981c0213b3a07508e48526
Author: justinjleet <ju...@...>
Date:   2018-05-30T13:38:29Z

    revert for temporary change

commit a15df6b27b7d71b59d746f0431effaa84533fb21
Author: justinjleet <ju...@...>
Date:   2018-05-30T13:43:28Z

    removing comment

----


---

[GitHub] metron issue #1037: METRON-1547: Solr Comment Fields

Posted by merrimanr <gi...@git.apache.org>.
Github user merrimanr commented on the issue:

    https://github.com/apache/metron/pull/1037
  
    I agree with you @justinleet, we should drop the optional index from the query.


---

[GitHub] metron issue #1037: METRON-1547: Solr Comment Fields

Posted by justinleet <gi...@git.apache.org>.
Github user justinleet commented on the issue:

    https://github.com/apache/metron/pull/1037
  
    Comment not appearing created as https://issues.apache.org/jira/browse/METRON-1596


---

[GitHub] metron issue #1037: METRON-1547: Solr Comment Fields

Posted by justinleet <gi...@git.apache.org>.
Github user justinleet commented on the issue:

    https://github.com/apache/metron/pull/1037
  
    Closing PR now that this is merged into the feature branch.


---

[GitHub] metron issue #1037: METRON-1547: Solr Comment Fields

Posted by justinleet <gi...@git.apache.org>.
Github user justinleet commented on the issue:

    https://github.com/apache/metron/pull/1037
  
    The ES not updating appears to be a preexisting issue, and I will file another bug.


---

[GitHub] metron issue #1037: METRON-1547: Solr Comment Fields

Posted by cestella <gi...@git.apache.org>.
Github user cestella commented on the issue:

    https://github.com/apache/metron/pull/1037
  
    This looks good to me.  +1 by inspection


---

[GitHub] metron issue #1037: METRON-1547: Solr Comment Fields

Posted by justinleet <gi...@git.apache.org>.
Github user justinleet commented on the issue:

    https://github.com/apache/metron/pull/1037
  
    Index removed from rest calls. I spun up full dev and confirmed both ES and Solr still work as expected, and that the calls do not pass along index anymore.  Feature branch merged in to resolve conflicts.


---

[GitHub] metron pull request #1037: METRON-1547: Solr Comment Fields

Posted by justinleet <gi...@git.apache.org>.
Github user justinleet closed the pull request at:

    https://github.com/apache/metron/pull/1037


---

[GitHub] metron issue #1037: METRON-1547: Solr Comment Fields

Posted by justinleet <gi...@git.apache.org>.
Github user justinleet commented on the issue:

    https://github.com/apache/metron/pull/1037
  
    Kick Travis for cache bug


---

[GitHub] metron issue #1037: METRON-1547: Solr Comment Fields

Posted by justinleet <gi...@git.apache.org>.
Github user justinleet commented on the issue:

    https://github.com/apache/metron/pull/1037
  
    This can be tested both on via REST API and via the UI, although as noted above there is UI instability for right now.
    
    It should work for both ES and Solr (although right now Solr requires `index` to be passed with requests, so make sure to add it in the following steps. `index` will be the same as `sensorType`). 
    
    The examples tests are done with curl, but could also be done in Swagger.
    
    ## To setup Solr
    ```
    sudo su -
    export METRON_HOME=/usr/metron/0.4.3
    cd ${METRON_HOME}/bin/
    ./install_solr.sh
    ./create_collection.sh bro
    ./create_collection.sh yaf
    ./create_collection.sh snort
    ./create_collection.sh error
    ./create_collection.sh metaalert
    ```
    
    Edit the globe config at ${METRON_HOME}/config/zookeeper/global.json to have "source.type.field"
    , e.g.
      "geo.hdfs.file" : "/apps/metron/geo/default/GeoLite2-City.mmdb.gz",
      "source.type.field" : "source.type"
    
    ${METRON_HOME}/bin/zk_load_configs.sh -z node1:2181 -c GLOBAL -m PUSH -i ${METRON_HOME}/config/zookeeper/
    
    Ensure the new config is found.
    ${METRON_HOME}/bin/zk_load_configs.sh -z node1:2181 -c GLOBAL -m DUMP
    
    In Ambari:
    Indexing -> Random Access Search Engine -> Solr
    
    Restart Metron Indexing, Metron REST, and Metron Alerts UI
    
    ## Testing
    Make sure to replace the guid and add index as needed throughout
    
    ### Get a GUID
    ```
    curl -u user:password -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' -d '{
      "fields": [
        "guid"
      ],
      "from": 0,
      "indices": [
        "bro"
      ],
      "query": "*:*",
      "size": 1
    }' 'http://node1:8082/api/v1/search/search'
    ```
    
    #### Sample Response
    ```
    {
      "total": 2120,
      "results": [
        {
          "id": "099042a2-ed3f-46df-8d44-2c42e3adf412",
          "source": {
            "guid": "099042a2-ed3f-46df-8d44-2c42e3adf412"
          },
          "score": 1,
          "index": "bro_index_2018.05.15.16"
        }
      ],
      "facetCounts": null
    }
    ```
    
    ### Create a new comment
    ```
    curl -u user:password -X POST --header 'Content-Type: application/json' --header 'Accept: */*' -d '{
      "comment": "My Comment",
      "guid": "099042a2-ed3f-46df-8d44-2c42e3adf412",
      "sensorType": "bro",
      "timestamp": 1526401584951,
      "username": "test_username"
    }' 'http://node1:8082/api/v1/update/add/comment'
    ```
    
    ### Call findOne
    ```
    curl -u user:password -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' -d '{
      "guid": "099042a2-ed3f-46df-8d44-2c42e3adf412",
      "sensorType": "bro"
    }' 'http://node1:8082/api/v1/search/findOne'
    ```
    
    #### Response should contain a new comments field
    ```
      "comments": [
        {
          "comment": "My Comment",
          "username": "test_username",
          "timestamp": 1526401584951
        }
      ]
    ```
    
    ### Add another comment
    ```
    curl -u user:password -X POST --header 'Content-Type: application/json' --header 'Accept: */*' -d '{
      "comment": "My Comment 2",
      "guid": "099042a2-ed3f-46df-8d44-2c42e3adf412",
      "sensorType": "bro",
      "timestamp": 1526401584955,
      "username": "test_username_2"
    }' 'http://node1:8082/api/v1/update/add/comment'
    ```
    
    ### Patch the comment with a new field
    This ensures the raw form is properly translated during patch operations (otherwise it can be mangled and not be readable later)
    ```
    curl -u user:password -X PATCH --header 'Content-Type: application/json' --header 'Accept: */*' -d '{
      "guid": "099042a2-ed3f-46df-8d44-2c42e3adf412",
      "patch": [
            {
            "op": "add",
            "path": "/project",
            "value": "metron"
        }
      ],
      "sensorType": "bro"
    }' 'http://node1:8082/api/v1/update/patch'
    ```
    
    ### Find it again
    ```
    curl -u user:password -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' -d '{
      "guid": "099042a2-ed3f-46df-8d44-2c42e3adf412",
      "sensorType": "bro"
    }' 'http://node1:8082/api/v1/search/findOne'
    ```
    
    Response should have both comments and the new field
    ```
      "comments": [
        {
          "comment": "My Comment",
          "username": "test_username",
          "timestamp": 1526401584951
        },
        {
          "comment": "My Comment 2",
          "username": "test_username_2",
          "timestamp": 1526401584955
        }
      ]
    ```
    
    ### Remove comment
    ```
    curl -u user:password -X POST --header 'Content-Type: application/json' --header 'Accept: */*' -d '{
      "comment": "My Comment",
      "guid": "099042a2-ed3f-46df-8d44-2c42e3adf412",
      "sensorType": "bro",
      "timestamp": 1526401584951,
      "username": "test_username"
    }' 'http://node1:8082/api/v1/update/remove/comment'
    ```
    
    ### Find it again.
    ```
    curl -u user:password -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' -d '{
      "guid": "099042a2-ed3f-46df-8d44-2c42e3adf412",
      "sensorType": "bro"
    }' 'http://node1:8082/api/v1/search/findOne'
    ```
    
    The comment should be removed, leaving something like
    ```
      "comments": [
        {
          "comment": "My Comment 2",
          "username": "test_username_2",
          "timestamp": 1526401584955
        }
      ]
    ```
    
    If you repeat the remove, nothing should happen to the alert.
    
    ### Remove the remaining comment
    ```
    curl -u user:password -X POST --header 'Content-Type: application/json' --header 'Accept: */*' -d '{
      "comment": "My Comment 2",
      "guid": "099042a2-ed3f-46df-8d44-2c42e3adf412",
      "index": "bro_index_2018.05.15.16",
      "sensorType": "bro",
      "timestamp": 1526401584955,
      "username": "test_username_2"
    }' 'http://node1:8082/api/v1/update/remove/comment'
    ```
    
    ### Find the alert again.
    It should no longer have comments.
    
    If you repeat the remove, nothing should happen to the alert.
    
    In the UI, similar steps can be performed to add comments to a particular alert, as well as deleting them. The index can be checked to ensure the alert itself has the correct results as above.


---

[GitHub] metron issue #1037: METRON-1547: Solr Comment Fields

Posted by justinleet <gi...@git.apache.org>.
Github user justinleet commented on the issue:

    https://github.com/apache/metron/pull/1037
  
    I believe the Travis issues have been resolved by the commit yesterday reverting a log level change in testing.


---

[GitHub] metron issue #1037: METRON-1547: Solr Comment Fields

Posted by justinleet <gi...@git.apache.org>.
Github user justinleet commented on the issue:

    https://github.com/apache/metron/pull/1037
  
    I haven't been able to reproduce Solr not making the delete call, and given that the code is the same between ES and Solr, I'm inclined to call it a browser issue.
    
    I have spun this back up for both ES and Solr (with the caveat that the default "source.type.field" for ES is broken until master is merged all the way down.
    
    At this point both work, after a minor fix that would result in an off by one error in the UI when deleting.  The UI is functional for both, although with the previously mentioned preexisting latency issue in updating, I do recommend closing and reopening the tab or things don't line up correctly.
    
    At this point, the only issue is the indexString.


---

[GitHub] metron issue #1037: METRON-1547: Solr Comment Fields

Posted by justinleet <gi...@git.apache.org>.
Github user justinleet commented on the issue:

    https://github.com/apache/metron/pull/1037
  
    Sidenote, I've also seen this branch fail several times on Travis with some testing issues around ZK, so even when the existing problems get solved, I'd like to dig into that more before merging.
    
    An example can be seen at https://travis-ci.org/justinleet/metron/builds/385698516. I haven't seen anything in the PR that would directly cause this, but please correct me if I'm wrong. I'm wondering if we're hitting a tipping point or snag in how we set up some testing and if this is just the straw that broke the camel's back.


---

[GitHub] metron issue #1037: METRON-1547: Solr Comment Fields

Posted by cestella <gi...@git.apache.org>.
Github user cestella commented on the issue:

    https://github.com/apache/metron/pull/1037
  
    Did you specifically run this up in the UI backed by both solr and ES?


---

[GitHub] metron pull request #1037: METRON-1547: Solr Comment Fields

Posted by justinleet <gi...@git.apache.org>.
Github user justinleet closed the pull request at:

    https://github.com/apache/metron/pull/1037


---

[GitHub] metron issue #1037: METRON-1547: Solr Comment Fields

Posted by justinleet <gi...@git.apache.org>.
Github user justinleet commented on the issue:

    https://github.com/apache/metron/pull/1037
  
    @cestella For that indexString thing, we could do a couple things
    
    - Leave it as-is for now, and fix both when they need to be.
    - Figure out how to fix it and fix both here.
    - Drop index from this query entirely. Given that we have source type, it should be sufficient.
    
    I personally lean towards the last one, unless we either know a fix is imminent or it's easy to do.  Index is pretty extraneous given that we use source type everywhere and we can do a lookup on the source type  anyway.
    
    Any preference?


---

[GitHub] metron issue #1037: METRON-1547: Solr Comment Fields

Posted by justinleet <gi...@git.apache.org>.
Github user justinleet commented on the issue:

    https://github.com/apache/metron/pull/1037
  
    Having spun up #1040, it looks like the rest API indexString weirdness might be outside the scope of this PR, but I'll want to dig in a bit more before promising that.


---

[GitHub] metron issue #1037: METRON-1547: Solr Comment Fields

Posted by justinleet <gi...@git.apache.org>.
Github user justinleet commented on the issue:

    https://github.com/apache/metron/pull/1037
  
    @cestella I have, yes, but it'll need to happen again because there's an issue in ES, and issue in Solr, and a general issue.
    
    The easiest way to go about it is generally to just spin up full dev, make sure it works in ES, swap over to Solr, make sure it works there.


---

[GitHub] metron issue #1037: METRON-1547: Solr Comment Fields

Posted by cestella <gi...@git.apache.org>.
Github user cestella commented on the issue:

    https://github.com/apache/metron/pull/1037
  
    Yes, we should drop index from the query, agreed.


---

[GitHub] metron pull request #1037: METRON-1547: Solr Comment Fields

Posted by justinleet <gi...@git.apache.org>.
GitHub user justinleet reopened a pull request:

    https://github.com/apache/metron/pull/1037

    METRON-1547: Solr Comment Fields

    ## Contributor Comments
    Adding support for comments on Alerts in Solr.  Nested objects are absurdly painful, so this follows the ES expectation of these not needing to be queryable.
    
    Solr doesn't have a great way to store these as-is, so they're stored as raw JSON, which is converted appropriately to ensure everything sees the same data as in the ES case.
    
    The REST API has been adjusted to have add/remove comment calls, rather than just patching (since that won't work in Solr directly). However, index is required to avoid an error for Solr right now as a result of METRON-1585.  Once that is fixed, index will be optional.
    
    There are currently a couple bugs that I would love some help with.
    
    -  ~In ES, when you add a comment, it doesn't immediately show up on the comments list.  It looks like a findOne is fired off, but I assume ES isn't updated yet.  This doesn't appear to happen in Solr.~ Preexisting, related to UI's handling of new comments.
    - When I hit delete on a comment in the UI (at least in Solr, unsure about ES), the comment is visually removed, but no remove request is fired off. I assume I have something misaligned, but I'm not sure what.
    - I patterned the optional index off of findOne, because it handles it a bit specially.  Delightfully, now I have an extra indexString field showing up in both findOne and the add remove comment.  There's some JsonGetter annotation thing I'm probably not using correctly.  This also happens in findOne currently, so it looks like it's probably a matter of getting the right fix and updating this to match.
    
    To test,
    This can be tested both via REST and the UI.  As noted above, at least right now the UI has more instability associated with it.
    
    ## Pull Request Checklist
    
    Thank you for submitting a contribution to Apache Metron.  
    Please refer to our [Development Guidelines](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61332235) for the complete guide to follow for contributions.  
    Please refer also to our [Build Verification Guidelines](https://cwiki.apache.org/confluence/display/METRON/Verifying+Builds?show-miniview) for complete smoke testing guides.  
    
    
    In order to streamline the review of the contribution we ask you follow these guidelines and ask you to double check the following:
    
    ### For all changes:
    - [x] Is there a JIRA ticket associated with this PR? If not one needs to be created at [Metron Jira](https://issues.apache.org/jira/browse/METRON/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel).
    - [x] Does your PR title start with METRON-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
    - [x] Has your PR been rebased against the latest commit within the target branch (typically master)?
    
    
    ### For code changes:
    - [ ] Have you included steps to reproduce the behavior or problem that is being changed or addressed?
    - [ ] Have you included steps or a guide to how the change may be verified and tested manually?
    - [ ] Have you ensured that the full suite of tests and checks have been executed in the root metron folder via:
      ```
      mvn -q clean integration-test install && dev-utilities/build-utils/verify_licenses.sh 
      ```
    
    - [x] Have you written or updated unit tests and or integration tests to verify your changes?
    - [x] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
    - [ ] Have you verified the basic functionality of the build by building and running locally with Vagrant full-dev environment or the equivalent?
    
    ### For documentation related changes:
    - [ ] Have you ensured that format looks appropriate for the output in which it is rendered by building and verifying the site-book? If not then run the following commands and the verify changes via `site-book/target/site/index.html`:
    
      ```
      cd site-book
      mvn site
      ```
    
    #### Note:
    Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.
    It is also recommended that [travis-ci](https://travis-ci.org) is set up for your personal repository such that your branches are built there before submitting a pull request.


You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/justinleet/metron solrCommentsBlob

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/metron/pull/1037.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #1037
    
----
commit bc44653102f9f628ae23fee1309048dbc07ca0b8
Author: justinjleet <ju...@...>
Date:   2018-05-09T19:54:57Z

    Mostly working

commit 1778a6941b861fafb4b67e188323bd13d5e9df8b
Author: justinjleet <ju...@...>
Date:   2018-05-14T00:49:31Z

    Fixing error message

commit b7eb68012a07c1c8c045012e8abfdfc7dc11e55b
Author: justinjleet <ju...@...>
Date:   2018-05-14T02:43:34Z

    Fixing multiindexdao to grab latest before delegating to avoid hbase sadness

commit 3ce28390c11fe5e7d7355eab4c57dffa1004f6e9
Author: justinjleet <ju...@...>
Date:   2018-05-14T11:45:14Z

    fixing concurrent mod problem

commit 0b48179a8599888d3d4a8aafa848cf3c0d891f3b
Author: justinjleet <ju...@...>
Date:   2018-05-14T11:57:01Z

    Fixing schema tests to handle new field

commit 45212df8879f5a400262b715a1a1aef828397028
Author: justinjleet <ju...@...>
Date:   2018-05-14T20:31:07Z

    reverting es pom from testing

commit ea504dca9d2c5475d4753f974a08c65a0f5fa26e
Author: justinjleet <ju...@...>
Date:   2018-05-14T21:27:04Z

    testing UI changes to rest api

commit d0f202b127f5aa1d6d718184d57b8d676d93a5d5
Author: justinjleet <ju...@...>
Date:   2018-05-18T12:25:51Z

    testing ui changes

commit 7aaa63d9ccbb8896ecfc95be50b29cf4fa09851f
Author: justinjleet <ju...@...>
Date:   2018-05-23T10:47:04Z

    merge from feature/METRON-1416-upgrade-solr

commit 1d7347b71d8e0151f0152608fb39e0e80813d0b5
Author: justinjleet <ju...@...>
Date:   2018-05-23T14:17:51Z

    working on fixing patch

commit b4649fa26b0bd44eb23670783f781bea43aa7512
Author: justinjleet <ju...@...>
Date:   2018-05-23T17:57:08Z

    fixing plus logging

commit 1867c8d8553a07dd42d3f90609076dbe3c6ae0ed
Author: justinjleet <ju...@...>
Date:   2018-05-29T23:30:48Z

    variety of fixes post merge and race condition fix

commit 4e592d7ad63711fce2f3c3c1e7f48df1f228538b
Author: justinjleet <ju...@...>
Date:   2018-05-30T11:57:34Z

    stray println

commit 21b87f345e783baaeb981c0213b3a07508e48526
Author: justinjleet <ju...@...>
Date:   2018-05-30T13:38:29Z

    revert for temporary change

commit a15df6b27b7d71b59d746f0431effaa84533fb21
Author: justinjleet <ju...@...>
Date:   2018-05-30T13:43:28Z

    removing comment

commit 441e3397d46eb677091793a4ddebbd37d788ee16
Author: justinjleet <ju...@...>
Date:   2018-05-31T13:35:08Z

    minor fixes

commit 2d4c723ea3fe4153093ad2ae7ed3ab1c25f1c923
Author: justinjleet <ju...@...>
Date:   2018-06-01T18:52:07Z

    Removing old splice call that resulted in off by one error in UI

----


---