http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml index 9cd0398..d5dc121 100644 --- a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml +++ b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml @@ -19,6 +19,7 @@ * limitations under the License. */ --> + <configuration supports_final="false" supports_adding_forbidden="true"> <property require-input="true"> <name>kdc_type</name> @@ -31,9 +32,8 @@ <type>componentHost</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>manage_identities</name> <description> @@ -47,9 +47,8 @@ <overridable>false</overridable> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>manage_auth_to_local</name> <description> @@ -62,9 +61,8 @@ <overridable>false</overridable> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>install_packages</name> <display-name>Install OS-specific Kerberos client package(s)</display-name> @@ -78,9 +76,8 @@ <type>boolean</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property require-input="true"> <name>ldap_url</name> <display-name>LDAP url</display-name> @@ -93,9 +90,8 @@ <visible>false</visible> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property require-input="true"> <name>container_dn</name> <display-name>Container DN</display-name> @@ -107,9 +103,8 @@ <overridable>false</overridable> </value-attributes> <value/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property require-input="true"> <name>encryption_types</name> <display-name>Encryption Types</display-name> @@ -121,9 +116,8 @@ <type>multiLine</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property require-input="true"> <name>realm</name> <description> @@ -136,9 +130,8 @@ <editable-only-at-install>true</editable-only-at-install> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property require-input="true"> <name>kdc_hosts</name> <description> @@ -151,9 +144,8 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property require-input="true"> <name>admin_server_host</name> <display-name>Kadmin host</display-name> @@ -165,9 +157,8 @@ <type>host</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>executable_search_paths</name> <display-name>Executable Search Paths</display-name> @@ -179,9 +170,8 @@ <overridable>false</overridable> <type>multiLine</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>password_length</name> <display-name>Password Length</display-name> @@ -192,9 +182,8 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>password_min_lowercase_letters</name> <display-name>Password Minimum # Lowercase Letters</display-name> @@ -206,9 +195,8 @@ <type>int</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>password_min_uppercase_letters</name> <display-name>Password Minimum # Uppercase Letters</display-name> @@ -220,9 +208,8 @@ <type>int</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>password_min_digits</name> <display-name>Password Minimum # Digits</display-name> @@ -234,9 +221,8 @@ <type>int</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>password_min_punctuation</name> <display-name>Password Minimum # Punctuation Characters</display-name> @@ -248,9 +234,8 @@ <type>int</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>password_min_whitespace</name> <display-name>Password Minimum # Whitespace Characters</display-name> @@ -262,9 +247,8 @@ <type>int</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>service_check_principal_name</name> <display-name>Test Kerberos Principal</display-name> @@ -275,9 +259,8 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>case_insensitive_username_rules</name> <display-name>Enable case insensitive username rules</display-name> @@ -289,9 +272,8 @@ <overridable>false</overridable> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>ad_create_attributes_template</name> <display-name>Account Attribute Template</display-name> @@ -321,24 +303,22 @@ <empty-value-valid>true</empty-value-valid> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> - <name>create_ambari_principal</name> - <description> + <name>create_ambari_principal</name> + <description> Indicates whether Ambari should create the principal, keytab for itself, used by different views. </description> - <value>true</value> - <display-name>Create Ambari Principal & Keytab</display-name> - <value-attributes> - <visible>true</visible> - <overridable>false</overridable> - <type>boolean</type> - </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> + <value>true</value> + <display-name>Create Ambari Principal & Keytab</display-name> + <value-attributes> + <visible>true</visible> + <overridable>false</overridable> + <type>boolean</type> + </value-attributes> +</property> + <property> <name>kdc_create_attributes</name> <display-name>Principal Attributes</display-name> @@ -350,9 +330,8 @@ <empty-value-valid>true</empty-value-valid> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>group</name> <display-name>IPA Group</display-name> @@ -364,9 +343,8 @@ <empty-value-valid>true</empty-value-valid> <visible>false</visible> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>set_password_expiry</name> <display-name>Set IPA principal password expiry</display-name> @@ -382,9 +360,8 @@ <overridable>false</overridable> <visible>false</visible> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>password_chat_timeout</name> <display-name>Set IPA kinit password chat timeout</display-name> @@ -398,7 +375,6 @@ <type>int</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/krb5-conf.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/krb5-conf.xml b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/krb5-conf.xml index ef44a28..7de155b 100644 --- a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/krb5-conf.xml +++ b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/krb5-conf.xml @@ -19,6 +19,7 @@ * limitations under the License. */ --> + <configuration> <property require-input="false"> <name>domains</name> @@ -31,9 +32,8 @@ <empty-value-valid>true</empty-value-valid> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>manage_krb5_conf</name> <display-name>Manage Kerberos client krb5.conf</display-name> @@ -45,9 +45,8 @@ <overridable>false</overridable> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>conf_dir</name> <display-name>krb5-conf directory path</display-name> @@ -57,8 +56,6 @@ <type>directory</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>content</name> @@ -88,9 +85,9 @@ [realms] {{realm}} = { -{%- if kdc_hosts > 0 -%} +{%- if kdc_hosts > 0 -%} {%- set kdc_host_list = kdc_hosts.split(',') -%} -{%- if kdc_host_list and kdc_host_list|length > 0 %} +{%- if kdc_host_list and kdc_host_list|length > 0 %} admin_server = {{admin_server_host|default(kdc_host_list[0]|trim(), True)}} {%- if kdc_host_list -%} {% for kdc_host in kdc_host_list %} @@ -107,7 +104,5 @@ <type>content</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/admin-topology.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/admin-topology.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/admin-topology.xml index 1353ea3..d8025de 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/admin-topology.xml +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/admin-topology.xml @@ -19,9 +19,11 @@ * limitations under the License. */ --> + <configuration supports_final="false" supports_adding_forbidden="true"> - <!-- topology file --> - <property> + <!-- topology file --> + + <property> <name>content</name> <display-name>admin-topology template</display-name> <value> @@ -88,11 +90,9 @@ The configuration specifies the Knox admin API configuration and access details. The authentication provider should be configured to match your deployment details. </description> <value-attributes> - <type>content</type> - <empty-value-valid>true</empty-value-valid> - <show-property-name>false</show-property-name> + <type>content</type> + <empty-value-valid>true</empty-value-valid> + <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml index dd5aa49..2347591 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml @@ -19,7 +19,9 @@ * limitations under the License. */ --> + <configuration supports_final="false" supports_adding_forbidden="true"> + <property> <name>content</name> <display-name>gateway-log4j template</display-name> @@ -82,7 +84,5 @@ <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml index 4c98536..4d4c4ed 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml @@ -16,57 +16,57 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> + <!-- The default settings for Knox. --> <!-- Edit gateway-site.xml to change settings for your local --> <!-- install. --> + <configuration supports_final="false"> - <property> - <name>gateway.port</name> - <value>8443</value> - <description>The HTTP port for the Gateway.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>gateway.path</name> - <value>gateway</value> - <description>The default context path for the gateway.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>gateway.gateway.conf.dir</name> - <value>deployments</value> - <description>The directory within GATEWAY_HOME that contains gateway topology files and deployments.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>gateway.hadoop.kerberos.secured</name> - <value>false</value> - <description>Boolean flag indicating whether the Hadoop cluster protected by Gateway is secured with Kerberos</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>java.security.krb5.conf</name> - <value>/etc/knox/conf/krb5.conf</value> - <description>Absolute path to krb5.conf file</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>java.security.auth.login.config</name> - <value>/etc/knox/conf/krb5JAASLogin.conf</value> - <description>Absolute path to JASS login config file</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>sun.security.krb5.debug</name> - <value>true</value> - <description>Boolean flag indicating whether to enable debug messages for krb5 authentication</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> + + <property> + <name>gateway.port</name> + <value>8443</value> + <description>The HTTP port for the Gateway.</description> + </property> + + <property> + <name>gateway.path</name> + <value>gateway</value> + <description>The default context path for the gateway.</description> + </property> + + <property> + <name>gateway.gateway.conf.dir</name> + <value>deployments</value> + <description>The directory within GATEWAY_HOME that contains gateway topology files and deployments.</description> + </property> + + <property> + <name>gateway.hadoop.kerberos.secured</name> + <value>false</value> + <description>Boolean flag indicating whether the Hadoop cluster protected by Gateway is secured with Kerberos</description> + </property> + + <property> + <name>java.security.krb5.conf</name> + <value>/etc/knox/conf/krb5.conf</value> + <description>Absolute path to krb5.conf file</description> + </property> + + <property> + <name>java.security.auth.login.config</name> + <value>/etc/knox/conf/krb5JAASLogin.conf</value> + <description>Absolute path to JASS login config file</description> + </property> + + <property> + <name>sun.security.krb5.debug</name> + <value>true</value> + <description>Boolean flag indicating whether to enable debug messages for krb5 authentication</description> + </property> + </configuration> + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml index 4869290..aa18eb4 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml @@ -19,11 +19,13 @@ * limitations under the License. */ --> + <configuration supports_final="false" supports_adding_forbidden="true"> <!-- knox-env.sh --> + <property require-input="true"> <name>knox_master_secret</name> - <value/> + <value></value> <display-name>Knox Master Secret</display-name> <property-type>PASSWORD</property-type> <description>password to use as the master secret</description> @@ -32,9 +34,8 @@ <editable-only-at-install>true</editable-only-at-install> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>knox_user</name> <display-name>Knox User</display-name> @@ -45,9 +46,8 @@ <type>user</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>knox_group</name> <display-name>Knox Group</display-name> @@ -57,9 +57,8 @@ <value-attributes> <type>user</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>knox_pid_dir</name> <value>/var/run/knox</value> @@ -70,19 +69,17 @@ <editable-only-at-install>true</editable-only-at-install> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + + <property> <name>knox_principal_name</name> <description>Knox principal name</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>knox_keytab_path</name> <description>Knox keytab path</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml index 0ef4fd0..d260861 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml @@ -19,7 +19,9 @@ * limitations under the License. */ --> + <configuration supports_final="false" supports_adding_forbidden="true"> + <property> <name>content</name> <display-name>ldap-log4j template</display-name> @@ -65,7 +67,5 @@ <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml index cfc0a7d..051918c 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml @@ -19,24 +19,23 @@ */ --> <configuration supports_final="true"> + <property> <name>policy_user</name> <value>ambari-qa</value> <display-name>Policy user for KNOX</display-name> <description>This user must be system user and also present at Ranger admin portal</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> + </property> + <property> <name>common.name.for.certificate</name> - <value/> + <value></value> <description>Common name for certificate, this value should match what is specified in repo within ranger admin</description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>ranger-knox-plugin-enabled</name> <value>No</value> @@ -52,17 +51,15 @@ <type>boolean</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>REPOSITORY_CONFIG_USERNAME</name> <value>admin</value> <display-name>Ranger repository config user</display-name> <description>Used for repository creation on ranger admin</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> + </property> + <property> <name>REPOSITORY_CONFIG_PASSWORD</name> <value>admin-password</value> @@ -72,22 +69,20 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> + </property> + <property> <name>KNOX_HOME</name> <value>/usr/local/knox-server</value> <display-name>Knox Home</display-name> <description>Knox home folder</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>XAAUDIT.DB.IS_ENABLED</name> <value>true</value> <display-name>Audit to DB</display-name> - <description/> + <description></description> <value-attributes> <type>boolean</type> </value-attributes> @@ -97,14 +92,13 @@ <name>xasecure.audit.destination.db</name> </property> </depends-on> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>XAAUDIT.HDFS.IS_ENABLED</name> <value>false</value> <display-name>Audit to HDFS</display-name> - <description/> + <description></description> <value-attributes> <type>boolean</type> </value-attributes> @@ -114,164 +108,143 @@ <name>xasecure.audit.destination.hdfs</name> </property> </depends-on> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name> <value>hdfs://localhost:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <description/> + <description></description> <depends-on> <property> <type>ranger-env</type> <name>xasecure.audit.destination.hdfs.dir</name> </property> </depends-on> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY</name> <value>__REPLACE__LOG_DIR/hadoop/%app-type%/audit</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY</name> <value>__REPLACE__LOG_DIR/hadoop/%app-type%/audit/archive</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>XAAUDIT.HDFS.DESTINTATION_FILE</name> <value>%hostname%-audit.log</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS</name> <value>900</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS</name> <value>86400</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS</name> <value>60</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>XAAUDIT.HDFS.LOCAL_BUFFER_FILE</name> <value>%time:yyyyMMdd-HHmm.ss%.log</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS</name> <value>60</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS</name> <value>600</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name> <value>10</value> - <description/> + <description></description> <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>SSL_KEYSTORE_FILE_PATH</name> <value>/etc/hadoop/conf/ranger-plugin-keystore.jks</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>SSL_KEYSTORE_PASSWORD</name> <value>myKeyFilePassword</value> <property-type>PASSWORD</property-type> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>SSL_TRUSTSTORE_FILE_PATH</name> <value>/etc/hadoop/conf/ranger-plugin-truststore.jks</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>SSL_TRUSTSTORE_PASSWORD</name> <value>changeit</value> <property-type>PASSWORD</property-type> - <description/> + <description></description> <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>POLICY_MGR_URL</name> <value>{{policymgr_mgr_url}}</value> - <description>Policy Manager url</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> + <description>Policy Manager url</description> + </property> + <property> <name>SQL_CONNECTOR_JAR</name> <value>{{sql_connector_jar}}</value> - <description>Location of DB client library (please check the location of the jar file)</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> + <description>Location of DB client library (please check the location of the jar file)</description> + </property> + <property> <name>XAAUDIT.DB.FLAVOUR</name> <value>{{xa_audit_db_flavor}}</value> - <description>The database type to be used (mysql/oracle)</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> + <description>The database type to be used (mysql/oracle)</description> + </property> + <property> <name>XAAUDIT.DB.DATABASE_NAME</name> <value>{{xa_audit_db_name}}</value> - <description>Audit database name</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> + <description>Audit database name</description> + </property> + <property> <name>XAAUDIT.DB.USER_NAME</name> <value>{{xa_audit_db_user}}</value> - <description>Audit database user</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> + <description>Audit database user</description> + </property> + <property> <name>XAAUDIT.DB.PASSWORD</name> <value>{{xa_audit_db_password}}</value> @@ -280,21 +253,18 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>XAAUDIT.DB.HOSTNAME</name> <value>{{xa_db_host}}</value> <description>Audit database hostname</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>REPOSITORY_NAME</name> <value>{{repo_name}}</value> - <description>Ranger repository name</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description>Ranger repository name</description> </property> -</configuration> + +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml index 91e1f7c..280908a 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml @@ -19,9 +19,11 @@ * limitations under the License. */ --> + <configuration supports_final="false" supports_adding_forbidden="true"> - <!-- topology file --> - <property> + <!-- topology file --> + + <property> <name>content</name> <display-name>topology template</display-name> <value> @@ -118,17 +120,15 @@ The configuration specifies the Hadoop cluster services Knox will provide access to. </description> <value-attributes> - <type>content</type> - <empty-value-valid>true</empty-value-valid> - <show-property-name>false</show-property-name> + <type>content</type> + <empty-value-valid>true</empty-value-valid> + <show-property-name>false</show-property-name> </value-attributes> - <depends-on> - <property> - <type>ranger-knox-plugin-properties</type> - <name>ranger-knox-plugin-enabled</name> - </property> - </depends-on> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> + <depends-on> + <property> + <type>ranger-knox-plugin-properties</type> + <name>ranger-knox-plugin-enabled</name> + </property> + </depends-on> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml index 1697a54..5dd5792 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml @@ -19,11 +19,13 @@ * limitations under the License. */ --> + <configuration supports_final="false" supports_adding_forbidden="true"> - <property> - <name>content</name> - <display-name>users-ldif template</display-name> - <value> + + <property> + <name>content</name> + <display-name>users-ldif template</display-name> + <value> # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -127,15 +129,13 @@ description: scientist group member: uid=sam,ou=people,dc=hadoop,dc=apache,dc=org </value> - <description> + <description> content for users-ldif file for the demo LDAP that comes with Knox. </description> - <value-attributes> - <type>content</type> - <empty-value-valid>true</empty-value-valid> - <show-property-name>false</show-property-name> - </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> + <value-attributes> + <type>content</type> + <empty-value-valid>true</empty-value-valid> + <show-property-name>false</show-property-name> + </value-attributes> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml index 028e055..b52a88f 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml @@ -19,8 +19,11 @@ * limitations under the License. */ --> + + <!-- This is a special config file for properties used to monitor status of the service --> <configuration supports_adding_forbidden="true"> + <property> <name>logfeeder_pid_dir</name> <value>/var/run/ambari-logsearch-logfeeder</value> @@ -29,9 +32,8 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logfeeder_log_dir</name> <value>/var/log/ambari-logsearch-logfeeder</value> @@ -40,9 +42,8 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logfeeder_user</name> <value>logfeeder</value> @@ -53,26 +54,23 @@ <type>user</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logfeeder_group</name> <value>logfeeder</value> <property-type>GROUP</property-type> <description>logfeeder group</description> <display-name>Logsfeeder Group</display-name> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logfeeder_max_mem</name> <value>512m</value> <description>Max Memory for Logfeeder</description> <display-name>Logfeeder max memory</display-name> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logfeeder_solr_service_logs_enable</name> <value>true</value> @@ -81,9 +79,8 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logfeeder_solr_audit_logs_enable</name> <value>true</value> @@ -92,24 +89,19 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logfeeder_solr_ssl_client_truststore_location</name> <value>/etc/security/serverKeys/logsearch-solr-ssl.trustStore.jks</value> <display-name>Logfeeder Solr client trust store location</display-name> <description>Location of the trust store file.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>logfeeder_solr_ssl_client_truststore_type</name> <value>jks</value> <display-name>Logfeeder Solr client trust store type</display-name> <description>Type of the trust store file.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>logfeeder_solr_ssl_client_truststore_password</name> @@ -120,24 +112,18 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>logfeeder_solr_ssl_client_keystore_location</name> <value>/etc/security/serverKeys/logsearch-solr-ssl.keyStore.jks</value> <display-name>Logfeeder Solr client key store location</display-name> <description>Location of the key store file.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>logfeeder_solr_ssl_client_keystore_type</name> <value>jks</value> <display-name>Logfeeder Solr client key store type</display-name> <description>Type of the key store file.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>logfeeder_solr_ssl_client_keystore_password</name> @@ -148,20 +134,18 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>content</name> <display-name>logfeeder-env template</display-name> <description>This is the jinja template for logsearch-env.sh file</description> - <value/> + <value></value> <property-type>VALUE_FROM_PROPERTY_FILE</property-type> <value-attributes> <property-file-name>logfeeder-env.sh.j2</property-file-name> <property-file-type>text</property-file-type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml index ec94796..6b1d5d1 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml @@ -21,18 +21,18 @@ --> <!-- This is a special config file for properties used to monitor status of the service --> <configuration supports_adding_forbidden="true"> + <!-- solrconfig.xml --> <property> <name>content</name> <display-name>logfeeder-log4j template</display-name> <description>This is the jinja template for log4j.xml file for logfeeder</description> - <value/> + <value></value> <property-type>VALUE_FROM_PROPERTY_FILE</property-type> <value-attributes> <property-file-name>logfeeder-log4j.xml.j2</property-file-name> <property-file-type>xml</property-file-type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> -</configuration> + +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml index 1562d77..5ed3c76 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml @@ -20,14 +20,14 @@ */ --> <configuration> + <property> <name>logfeeder.config.files</name> <value>{default_config_files}</value> <description>Comma separated config files in grok format</description> <display-name>Logfeeder config files</display-name> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logfeeder.checkpoint.folder</name> <value>/etc/ambari-logsearch-logfeeder/conf/checkpoints</value> @@ -36,17 +36,15 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logfeeder.metrics.collector.hosts</name> <value>{metrics_collector_hosts}</value> <description>Metrics collector hosts for pushing metrics by Logfeeder</description> <display-name>Metrics collector hosts</display-name> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logfeeder.log.filter.enable</name> <value>true</value> @@ -55,9 +53,8 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logfeeder.solr.config.interval</name> <value>5</value> @@ -66,7 +63,6 @@ <value-attributes> <type>int</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-json.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-json.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-json.xml index 54e59ae..fea7c54 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-json.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-json.xml @@ -20,17 +20,17 @@ */ --> <configuration supports_adding_forbidden="true"> + <property> <name>logsearch_admin_username</name> <value>ambari_logsearch_admin</value> <display-name>Admin username</display-name> <description>Log Search admin username</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property require-input="true"> <name>logsearch_admin_password</name> - <value/> + <value></value> <property-type>PASSWORD</property-type> <display-name>Admin password</display-name> <description>Log Search admin password</description> @@ -38,20 +38,18 @@ <overridable>false</overridable> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>content</name> <display-name>logsearch-admin-json template</display-name> <description>This is the jinja template for logsearch-admin.json file</description> - <value/> + <value></value> <property-type>VALUE_FROM_PROPERTY_FILE</property-type> <value-attributes> <property-file-name>logsearch-admin.json.j2</property-file-name> <property-file-type>text</property-file-type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml index 0817a9d..ca698fb 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml @@ -19,8 +19,10 @@ * limitations under the License. */ --> + <!-- This is a special config file for properties used to monitor status of the service --> <configuration supports_adding_forbidden="true"> + <property> <name>logsearch_audit_logs_max_retention</name> <value>7</value> @@ -30,9 +32,8 @@ <type>int</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_audit_logs_merge_factor</name> <value>5</value> @@ -45,21 +46,19 @@ <type>int</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <!-- solrconfig.xml --> <property> <name>content</name> <display-name>solrconfig template</display-name> <description>This is the jinja template for solrconfig.xml file for audit logs</description> - <value/> + <value></value> <property-type>VALUE_FROM_PROPERTY_FILE</property-type> <value-attributes> <property-file-name>audit_logs-solrconfig.xml.j2</property-file-name> <property-file-type>xml</property-file-type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml index d9d39f4..655520f 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml @@ -21,14 +21,14 @@ --> <!-- This is a special config file for properties used to monitor status of the service --> <configuration supports_adding_forbidden="true"> + <property> <name>logsearch_ui_port</name> <value>61888</value> <description>Default port for Log Search UI</description> <display-name>Log Search UI Port</display-name> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_pid_dir</name> <value>/var/run/ambari-logsearch-portal</value> @@ -37,9 +37,8 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_log_dir</name> <value>/var/log/ambari-logsearch-portal</value> @@ -48,9 +47,8 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_user</name> <value>logsearch</value> @@ -61,18 +59,16 @@ <type>user</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_group</name> <value>logsearch</value> <property-type>GROUP</property-type> <description>Log Search group</description> <display-name>Log Search Group</display-name> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_app_max_memory</name> <value>1024</value> @@ -85,9 +81,8 @@ <unit>MB</unit> <increment-step>256</increment-step> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_audit_logs_use_ranger</name> <value>false</value> @@ -97,9 +92,8 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_debug_enabled</name> <value>false</value> @@ -108,48 +102,40 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_debug_port</name> <value>5005</value> <display-name>Log Search Debug Port</display-name> <description>Debug port for Log Search Server</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_audit_logs_zk_node</name> <value>{logsearch_solr_znode}</value> <display-name>Solr Audit Logs Znode</display-name> <description>Only needed if using custom solr cloud. E.g. /audit_logs</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_audit_logs_zk_quorum</name> <value>{zookeeper_quorum}</value> <display-name>Solr Audit Logs ZK Quorum</display-name> <description>Only needed if using custom solr cloud. E.g. zk1:2181,zk2:2182</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_ssl_client_truststore_location</name> <value>/etc/security/serverKeys/logsearch-solr-ssl.trustStore.jks</value> <display-name>Log Search Solr client trust store location</display-name> <description>Location of the trust store file.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>logsearch_solr_ssl_client_truststore_type</name> <value>jks</value> <display-name>Log Search Solr client trust store type</display-name> <description>Type of the trust store file.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>logsearch_solr_ssl_client_truststore_password</name> @@ -160,24 +146,18 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>logsearch_solr_ssl_client_keystore_location</name> <value>/etc/security/serverKeys/logsearch-solr-ssl.keyStore.jks</value> <display-name>Log Search Solr client key store location</display-name> <description>Location of the key store file.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>logsearch_solr_ssl_client_keystore_type</name> <value>jks</value> <display-name>Log Search Solr client key store type</display-name> <description>Type of the key store file.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>logsearch_solr_ssl_client_keystore_password</name> @@ -188,21 +168,19 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <!-- logsearch-env.sh --> <property> <name>content</name> <display-name>logsearch-env template</display-name> <description>This is the jinja template for logsearch-env.sh file</description> - <value/> + <value></value> <property-type>VALUE_FROM_PROPERTY_FILE</property-type> <value-attributes> <property-file-name>logsearch-env.sh.j2</property-file-name> <property-file-type>text</property-file-type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml index 4706ea3..3b9d04b 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml @@ -19,20 +19,21 @@ * limitations under the License. */ --> + <!-- This is a special config file for properties used to monitor status of the service --> <configuration supports_adding_forbidden="true"> + <!-- log4j.xml --> <property> <name>content</name> <display-name>logsearch-log4j template</display-name> <description>This is the jinja template for log4j.xml file for logsearch server</description> - <value/> + <value></value> <property-type>VALUE_FROM_PROPERTY_FILE</property-type> <value-attributes> <property-file-name>logsearch-log4j.xml.j2</property-file-name> <property-file-type>xml</property-file-type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml index 5d533aa..0ba1de5 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml @@ -20,6 +20,7 @@ */ --> <configuration> + <property> <name>logsearch.collection.service.logs.numshards</name> <value>5</value> @@ -32,9 +33,8 @@ <unit>int</unit> <increment-step>1</increment-step> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch.collection.service.logs.replication.factor</name> <value>1</value> @@ -47,9 +47,8 @@ <unit>int</unit> <increment-step>1</increment-step> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch.collection.audit.logs.numshards</name> <value>5</value> @@ -62,9 +61,8 @@ <unit>int</unit> <increment-step>1</increment-step> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch.collection.audit.logs.replication.factor</name> <value>1</value> @@ -77,65 +75,56 @@ <unit>int</unit> <increment-step>1</increment-step> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch.solr.collection.service.logs</name> <value>hadoop_logs</value> <display-name>Log Search Solr Service Logs Collection</display-name> <description>Name for the service logs collection</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch.solr.collection.audit.logs</name> <value>audit_logs</value> <display-name>Log Search Solr Audit Logs Collection</display-name> <description>Name for the audit logs collection</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch.service.logs.fields</name> <value>logtime,level,event_count,ip,type,seq_num,path,file,line_number,host,log_message,id</value> <display-name>Log Search Solr Service Logs Fields</display-name> <description>Solr fields for service logs</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch.service.logs.split.interval.mins</name> <value>15</value> <display-name>Log Search Service Logs split interval</display-name> <description>Will create multiple collections and use alias. Valid values are single,hour_week</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch.audit.logs.split.interval.mins</name> <value>15</value> <display-name>Log Search Audit Logs split interval</display-name> <description>Will switch the shard after the interval specified. Valid values are none and greater than 1 </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch.logfeeder.include.default.level</name> <value>fatal,error,warn</value> <description>Include default Logfeeder log levels for Log Search</description> <display-name>Logfeeder log levels</display-name> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch.solr.metrics.collector.hosts</name> <value>{metrics_collector_hosts}</value> <description>Metrics collector hosts for pushing metrics by Log Search Solr</description> <display-name>Metrics collector hosts</display-name> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>logsearch.external.auth.enabled</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml index 0ed0d0d..65e2071 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml @@ -21,6 +21,7 @@ --> <!-- This is a special config file for properties used to monitor status of the service --> <configuration supports_adding_forbidden="true"> + <property> <name>logsearch_service_logs_max_retention</name> <value>7</value> @@ -30,9 +31,8 @@ <type>int</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_service_logs_merge_factor</name> <value>5</value> @@ -45,21 +45,19 @@ <type>int</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <!-- solrconfig.xml --> <property> <name>content</name> <display-name>solrconfig template</display-name> <description>This is the jinja template for solrconfig.xml file for service logs</description> - <value/> + <value></value> <property-type>VALUE_FROM_PROPERTY_FILE</property-type> <value-attributes> <property-file-name>service_logs-solrconfig.xml.j2</property-file-name> <property-file-type>xml</property-file-type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-client-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-client-log4j.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-client-log4j.xml index 014d473..e8a1ba5 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-client-log4j.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-client-log4j.xml @@ -19,20 +19,21 @@ * limitations under the License. */ --> + <!-- This is a special config file for properties used to monitor status of the service --> <configuration supports_adding_forbidden="true"> + <!-- log4j.xml --> <property> <name>content</name> <display-name>log4j template</display-name> <description>This is the jinja template for log4j.properties file for logsearch solr client</description> - <value/> + <value></value> <property-type>VALUE_FROM_PROPERTY_FILE</property-type> <value-attributes> <property-file-name>solr-client-log4j.properties.j2</property-file-name> <property-file-type>text</property-file-type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> -</configuration> + +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml index e82351b..2bf728c 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml @@ -21,22 +21,21 @@ --> <!-- This is a special config file for properties used to monitor status of the service --> <configuration supports_adding_forbidden="true"> + <property> <name>logsearch_solr_port</name> <value>8886</value> <description>Solr port</description> <display-name>Log Search Solr port</display-name> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_jmx_port</name> <value>18886</value> <description>Solr JMX port</description> <display-name>Log Search Solr JMX port</display-name> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_pid_dir</name> <value>/var/run/ambari-logsearch-solr</value> @@ -45,9 +44,8 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_log_dir</name> <value>/var/log/ambari-logsearch-solr</value> @@ -56,9 +54,8 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_client_log_dir</name> <value>/var/log/ambari-logsearch-solr-client</value> @@ -67,9 +64,8 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_user</name> <value>solr</value> @@ -80,18 +76,16 @@ <type>user</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_group</name> <value>solr</value> <property-type>GROUP</property-type> <description>Solr group</description> <display-name>Log Search Solr Group</display-name> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_datadir</name> <value>/opt/logsearch_solr/data</value> @@ -101,9 +95,8 @@ <type>directory</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_ssl_enabled</name> <value>false</value> @@ -112,25 +105,22 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_ssl_server_truststore_location</name> <value>/etc/security/serverKeys/logsearch-solr-ssl.trustStore.jks</value> <display-name>Log Search Solr trust store location</display-name> <description>Location of the trust store file.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_ssl_server_truststore_type</name> <value>jks</value> <display-name>Log Search Solr trust store type</display-name> <description>Type of the trust store file.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_ssl_server_truststore_password</name> <value>bigdata</value> @@ -140,25 +130,22 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_ssl_server_keystore_location</name> <value>/etc/security/serverKeys/logsearch-solr-ssl.keyStore.jks</value> <display-name>Log Search Solr key store location</display-name> <description>Location of the key store file.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_ssl_server_keystore_type</name> <value>jks</value> <display-name>Log Search Solr key store type</display-name> <description>Type of the key store file.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_ssl_server_keystore_password</name> <value>bigdata</value> @@ -168,9 +155,8 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_znode</name> <value>/ambari-solr</value> @@ -179,9 +165,8 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_minmem</name> <value>512</value> @@ -194,9 +179,8 @@ <unit>MB</unit> <increment-step>256</increment-step> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>logsearch_solr_maxmem</name> <value>1024</value> @@ -209,21 +193,19 @@ <unit>MB</unit> <increment-step>256</increment-step> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <!-- logsearch-solr-env.sh --> <property> <name>content</name> <display-name>logsearch-solr-env template</display-name> <description>This is the jinja template for logsearch-solr-env.sh file</description> - <value/> + <value></value> <property-type>VALUE_FROM_PROPERTY_FILE</property-type> <value-attributes> <property-file-name>logsearch-solr-env.sh.j2</property-file-name> <property-file-type>text</property-file-type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml index 9f30e09..97bcc0d 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml @@ -20,17 +20,17 @@ */ --> <configuration supports_adding_forbidden="true"> + <property> <name>content</name> <display-name>logsearch-solr-log4j template</display-name> <description>This is the jinja template for log4j.properties</description> - <value/> + <value></value> <property-type>VALUE_FROM_PROPERTY_FILE</property-type> <value-attributes> <property-file-name>solr-log4j.properties.j2</property-file-name> <property-file-type>text</property-file-type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml index 476f464..30772f6 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml @@ -20,17 +20,17 @@ */ --> <configuration supports_adding_forbidden="true"> + <property> <name>content</name> <display-name>logsearch-solr-xml template</display-name> <description>This is the jinja template for logsearch solr.xml file</description> - <value/> + <value></value> <property-type>VALUE_FROM_PROPERTY_FILE</property-type> <value-attributes> <property-file-name>solr.xml.j2</property-file-name> <property-file-type>xml</property-file-type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> -</configuration> + +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml index 0b21f08..29f8c6b 100644 --- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml +++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml @@ -19,18 +19,17 @@ * limitations under the License. */ --> + <configuration supports_adding_forbidden="true"> - <property> - <name>mahout_user</name> - <display-name>Mahout User</display-name> - <value>mahout</value> - <property-type>USER</property-type> - <description>Mahout user</description> - <value-attributes> - <type>user</type> - <overridable>false</overridable> - </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> + <property> + <name>mahout_user</name> + <display-name>Mahout User</display-name> + <value>mahout</value> + <property-type>USER</property-type> + <description>Mahout user</description> + <value-attributes> + <type>user</type> + <overridable>false</overridable> + </value-attributes> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml index b376f82..d8b0015 100644 --- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml +++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml @@ -19,12 +19,14 @@ * limitations under the License. */ --> + <configuration supports_final="false" supports_adding_forbidden="true"> - <property> - <name>content</name> - <display-name>mahout-log4j template</display-name> - <description>Custom log4j.properties</description> - <value> + + <property> + <name>content</name> + <display-name>mahout-log4j template</display-name> + <description>Custom log4j.properties</description> + <value> # # # Licensed to the Apache Software Foundation (ASF) under one @@ -59,11 +61,10 @@ log4j.logger.org.eclipse.jetty=WARN log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=WARN log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=WARN </value> - <value-attributes> - <type>content</type> - <show-property-name>false</show-property-name> - </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> + <value-attributes> + <type>content</type> + <show-property-name>false</show-property-name> + </value-attributes> + </property> + </configuration>
