Re: Review Request 46196: Logsearch: reading config values from external property files

2016-04-18 Thread Jayush Luniya 

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46196/#review129297
---


Ship it!




Ship It!

- Jayush Luniya


On April 15, 2016, 4:03 p.m., Oliver Szabo wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46196/
> ---
> 
> (Updated April 15, 2016, 4:03 p.m.)
> 
> 
> Review request for Ambari, Jayush Luniya, Robert Nettleton, and Sumit Mohanty.
> 
> 
> Bugs: AMBARI-15842
> https://issues.apache.org/jira/browse/AMBARI-15842
> 
> 
> Repository: ambari
> 
> 
> Description
> ---
> 
> Reading config values (like xml files or *.sh scripts) from external property 
> files.
> 
> I did not added xml support for reading external property files. Reason is 
> because these xml files are jinja templates. So they can act as text files.
> 
> also added: Solr Instance renamed to LogSearch Solr Instance
> 
> 
> Diffs
> -
> 
>   
> ambari-server/src/main/java/org/apache/ambari/server/stack/ConfigurationDirectory.java
>  84842e2 
>   ambari-server/src/main/java/org/apache/ambari/server/utils/XmlUtils.java 
> PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml
>  94ed27d 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml
>  91fc0ce 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml
>  4da16b1 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml
>  ef6bebf 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml
>  6741f41 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml
>  60363c8 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml
>  855f0e5 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml
>  e99cb81 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml
>  d31d0b3 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml 
> 018398f 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-log4j.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-solr-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/solr-log4j.properties.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/solr.xml.j2
>  PRE-CREATION 
> 
> Diff: https://reviews.apache.org/r/46196/diff/
> 
> 
> Testing
> ---
> 
> Total run:959
> Total errors:0
> Total failures:0
> 
> 
> Thanks,
> 
> Oliver Szabo
> 
>

Re: Review Request 46196: Logsearch: reading config values from external property files

2016-04-15 Thread Oliver Szabo 

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46196/
---

(Updated April 15, 2016, 4:03 p.m.)


Review request for Ambari, Jayush Luniya, Robert Nettleton, and Sumit Mohanty.


Changes
---

- added xml support (xml validtion)


Bugs: AMBARI-15842
https://issues.apache.org/jira/browse/AMBARI-15842


Repository: ambari


Description
---

Reading config values (like xml files or *.sh scripts) from external property 
files.

I did not added xml support for reading external property files. Reason is 
because these xml files are jinja templates. So they can act as text files.

also added: Solr Instance renamed to LogSearch Solr Instance


Diffs (updated)
-

  
ambari-server/src/main/java/org/apache/ambari/server/stack/ConfigurationDirectory.java
 84842e2 
  ambari-server/src/main/java/org/apache/ambari/server/utils/XmlUtils.java 
PRE-CREATION 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml
 94ed27d 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml
 91fc0ce 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml
 4da16b1 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml
 ef6bebf 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml
 6741f41 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml
 60363c8 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml
 855f0e5 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml
 e99cb81 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml
 d31d0b3 
  ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml 
018398f 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2
 PRE-CREATION 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-env.sh.j2
 PRE-CREATION 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2
 PRE-CREATION 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2
 PRE-CREATION 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-log4j.xml.j2
 PRE-CREATION 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-solr-env.sh.j2
 PRE-CREATION 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2
 PRE-CREATION 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/solr-log4j.properties.j2
 PRE-CREATION 
  
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/solr.xml.j2
 PRE-CREATION 

Diff: https://reviews.apache.org/r/46196/diff/


Testing
---

Total run:959
Total errors:0
Total failures:0


Thanks,

Oliver Szabo

Re: Review Request 46196: Logsearch: reading config values from external property files

2016-04-15 Thread Oliver Szabo 


> On April 15, 2016, 9:06 a.m., Jayush Luniya wrote:
> > ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2,
> >  line 1
> > 
> >
> > I don't think this will work as the format of the document is really 
> > XML and embedding an XML markup data as an XML value wouldnt work. You will 
> > need to either add CDATA to the document or encode it if you want to use it 
> > as plain text. Better to add support for XML_PROPERTY_FILE_TYPE so that we 
> > can add logic to encode the property xml contents.
> > 
> > You can verify this by starting ambari server and noticing that this 
> > config type will fail to show up in the STACKS API.
> 
> Oliver Szabo wrote:
> I tried that, did not failed and i could install a cluster with my 
> configurations. CDATA is not the best option, because there are CDATA tags in 
> that xml too, so its closing tag closed the initial CDATA tag (i mean if I 
> tried that in the *-site.xml )
> 
> Oliver Szabo wrote:
> of course that format can cause issues with e.g. blueprint export so i 
> should notice that

I checked multiple times now, so its looking good with export blueprints and 
with the stacks API too. But of course i can add XML support just for 
validation (same like with JSON type)


- Oliver


---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46196/#review129084
---


On April 14, 2016, 11:47 a.m., Oliver Szabo wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46196/
> ---
> 
> (Updated April 14, 2016, 11:47 a.m.)
> 
> 
> Review request for Ambari, Jayush Luniya, Robert Nettleton, and Sumit Mohanty.
> 
> 
> Bugs: AMBARI-15842
> https://issues.apache.org/jira/browse/AMBARI-15842
> 
> 
> Repository: ambari
> 
> 
> Description
> ---
> 
> Reading config values (like xml files or *.sh scripts) from external property 
> files.
> 
> I did not added xml support for reading external property files. Reason is 
> because these xml files are jinja templates. So they can act as text files.
> 
> also added: Solr Instance renamed to LogSearch Solr Instance
> 
> 
> Diffs
> -
> 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml
>  94ed27d 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml
>  91fc0ce 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml
>  4da16b1 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml
>  ef6bebf 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml
>  6741f41 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml
>  60363c8 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml
>  855f0e5 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml
>  e99cb81 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml
>  d31d0b3 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml 
> 018398f 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-log4j.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-solr-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/solr-log4j.properties.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/solr.xml.j2
>  PRE-CREATION 
> 
> Diff: https://reviews.apache.org/r/46196/diff/
> 
> 
> Testing
> ---
> 
> Total run:959
> Total errors:0
> Total failures:0
> 
> 
> Thanks,
> 
> Oliver Szabo
> 
>

Re: Review Request 46196: Logsearch: reading config values from external property files

2016-04-15 Thread Oliver Szabo 


> On April 15, 2016, 9:06 a.m., Jayush Luniya wrote:
> > ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2,
> >  line 1
> > 
> >
> > I don't think this will work as the format of the document is really 
> > XML and embedding an XML markup data as an XML value wouldnt work. You will 
> > need to either add CDATA to the document or encode it if you want to use it 
> > as plain text. Better to add support for XML_PROPERTY_FILE_TYPE so that we 
> > can add logic to encode the property xml contents.
> > 
> > You can verify this by starting ambari server and noticing that this 
> > config type will fail to show up in the STACKS API.
> 
> Oliver Szabo wrote:
> I tried that, did not failed and i could install a cluster with my 
> configurations. CDATA is not the best option, because there are CDATA tags in 
> that xml too, so its closing tag closed the initial CDATA tag (i mean if I 
> tried that in the *-site.xml )

of course that format can cause issues with e.g. blueprint export so i should 
notice that


- Oliver


---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46196/#review129084
---


On April 14, 2016, 11:47 a.m., Oliver Szabo wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46196/
> ---
> 
> (Updated April 14, 2016, 11:47 a.m.)
> 
> 
> Review request for Ambari, Jayush Luniya, Robert Nettleton, and Sumit Mohanty.
> 
> 
> Bugs: AMBARI-15842
> https://issues.apache.org/jira/browse/AMBARI-15842
> 
> 
> Repository: ambari
> 
> 
> Description
> ---
> 
> Reading config values (like xml files or *.sh scripts) from external property 
> files.
> 
> I did not added xml support for reading external property files. Reason is 
> because these xml files are jinja templates. So they can act as text files.
> 
> also added: Solr Instance renamed to LogSearch Solr Instance
> 
> 
> Diffs
> -
> 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml
>  94ed27d 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml
>  91fc0ce 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml
>  4da16b1 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml
>  ef6bebf 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml
>  6741f41 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml
>  60363c8 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml
>  855f0e5 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml
>  e99cb81 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml
>  d31d0b3 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml 
> 018398f 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-log4j.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-solr-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/solr-log4j.properties.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/solr.xml.j2
>  PRE-CREATION 
> 
> Diff: https://reviews.apache.org/r/46196/diff/
> 
> 
> Testing
> ---
> 
> Total run:959
> Total errors:0
> Total failures:0
> 
> 
> Thanks,
> 
> Oliver Szabo
> 
>

Re: Review Request 46196: Logsearch: reading config values from external property files

2016-04-15 Thread Oliver Szabo 


> On April 15, 2016, 9:06 a.m., Jayush Luniya wrote:
> > ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2,
> >  line 1
> > 
> >
> > I don't think this will work as the format of the document is really 
> > XML and embedding an XML markup data as an XML value wouldnt work. You will 
> > need to either add CDATA to the document or encode it if you want to use it 
> > as plain text. Better to add support for XML_PROPERTY_FILE_TYPE so that we 
> > can add logic to encode the property xml contents.
> > 
> > You can verify this by starting ambari server and noticing that this 
> > config type will fail to show up in the STACKS API.

I tried that, did not failed and i could install a cluster with my 
configurations. CDATA is not the best option, because there are CDATA tags in 
that xml too, so its closing tag closed the initial CDATA tag (i mean if I 
tried that in the *-site.xml )


- Oliver


---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46196/#review129084
---


On April 14, 2016, 11:47 a.m., Oliver Szabo wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46196/
> ---
> 
> (Updated April 14, 2016, 11:47 a.m.)
> 
> 
> Review request for Ambari, Jayush Luniya, Robert Nettleton, and Sumit Mohanty.
> 
> 
> Bugs: AMBARI-15842
> https://issues.apache.org/jira/browse/AMBARI-15842
> 
> 
> Repository: ambari
> 
> 
> Description
> ---
> 
> Reading config values (like xml files or *.sh scripts) from external property 
> files.
> 
> I did not added xml support for reading external property files. Reason is 
> because these xml files are jinja templates. So they can act as text files.
> 
> also added: Solr Instance renamed to LogSearch Solr Instance
> 
> 
> Diffs
> -
> 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml
>  94ed27d 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml
>  91fc0ce 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml
>  4da16b1 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml
>  ef6bebf 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml
>  6741f41 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml
>  60363c8 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml
>  855f0e5 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml
>  e99cb81 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml
>  d31d0b3 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml 
> 018398f 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-log4j.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-solr-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/solr-log4j.properties.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/solr.xml.j2
>  PRE-CREATION 
> 
> Diff: https://reviews.apache.org/r/46196/diff/
> 
> 
> Testing
> ---
> 
> Total run:959
> Total errors:0
> Total failures:0
> 
> 
> Thanks,
> 
> Oliver Szabo
> 
>

Re: Review Request 46196: Logsearch: reading config values from external property files

2016-04-15 Thread Jayush Luniya 

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46196/#review129084
---




ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2
 (line 1)


I don't think this will work as the format of the document is really XML 
and embedding an XML markup data as an XML value wouldnt work. You will need to 
either add CDATA to the document or encode it if you want to use it as plain 
text. Better to add support for XML_PROPERTY_FILE_TYPE so that we can add logic 
to encode the property xml contents.

You can verify this by starting ambari server and noticing that this config 
type will fail to show up in the STACKS API.


- Jayush Luniya


On April 14, 2016, 11:47 a.m., Oliver Szabo wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46196/
> ---
> 
> (Updated April 14, 2016, 11:47 a.m.)
> 
> 
> Review request for Ambari, Jayush Luniya, Robert Nettleton, and Sumit Mohanty.
> 
> 
> Bugs: AMBARI-15842
> https://issues.apache.org/jira/browse/AMBARI-15842
> 
> 
> Repository: ambari
> 
> 
> Description
> ---
> 
> Reading config values (like xml files or *.sh scripts) from external property 
> files.
> 
> I did not added xml support for reading external property files. Reason is 
> because these xml files are jinja templates. So they can act as text files.
> 
> also added: Solr Instance renamed to LogSearch Solr Instance
> 
> 
> Diffs
> -
> 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml
>  94ed27d 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml
>  91fc0ce 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml
>  4da16b1 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml
>  ef6bebf 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml
>  6741f41 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml
>  60363c8 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml
>  855f0e5 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml
>  e99cb81 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml
>  d31d0b3 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml 
> 018398f 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-log4j.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-solr-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/solr-log4j.properties.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/solr.xml.j2
>  PRE-CREATION 
> 
> Diff: https://reviews.apache.org/r/46196/diff/
> 
> 
> Testing
> ---
> 
> Total run:959
> Total errors:0
> Total failures:0
> 
> 
> Thanks,
> 
> Oliver Szabo
> 
>

Re: Review Request 46196: Logsearch: reading config values from external property files

2016-04-14 Thread Robert Nettleton 

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46196/#review128894
---


Ship it!




Ship It!

- Robert Nettleton


On April 14, 2016, 11:47 a.m., Oliver Szabo wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46196/
> ---
> 
> (Updated April 14, 2016, 11:47 a.m.)
> 
> 
> Review request for Ambari, Jayush Luniya, Robert Nettleton, and Sumit Mohanty.
> 
> 
> Bugs: AMBARI-15842
> https://issues.apache.org/jira/browse/AMBARI-15842
> 
> 
> Repository: ambari
> 
> 
> Description
> ---
> 
> Reading config values (like xml files or *.sh scripts) from external property 
> files.
> 
> I did not added xml support for reading external property files. Reason is 
> because these xml files are jinja templates. So they can act as text files.
> 
> also added: Solr Instance renamed to LogSearch Solr Instance
> 
> 
> Diffs
> -
> 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml
>  94ed27d 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml
>  91fc0ce 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml
>  4da16b1 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml
>  ef6bebf 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml
>  6741f41 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml
>  60363c8 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml
>  855f0e5 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml
>  e99cb81 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml
>  d31d0b3 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml 
> 018398f 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-log4j.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-solr-env.sh.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/solr-log4j.properties.j2
>  PRE-CREATION 
>   
> ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/solr.xml.j2
>  PRE-CREATION 
> 
> Diff: https://reviews.apache.org/r/46196/diff/
> 
> 
> Testing
> ---
> 
> Total run:959
> Total errors:0
> Total failures:0
> 
> 
> Thanks,
> 
> Oliver Szabo
> 
>