preparing for opendistro-1.0.0.1 release

Author: Nihal Harish

legacy/securityconfig_v6/roles.yml

@@ -103,7 +103,6 @@ opendistro_security_kibana_user:
     '*':
       '*':
         - indices:data/read/field_caps*
-        - indices:data/read/xpack/rollup*
         - indices:admin/mappings/get*
         - indices:admin/get
 
@@ -113,7 +112,6 @@ opendistro_security_kibana_server:
   cluster:
       - CLUSTER_MONITOR
       - CLUSTER_COMPOSITE_OPS
-      - cluster:admin/xpack/monitoring*
       - indices:admin/template*
       - indices:data/read/scroll*
   indices:
@@ -178,13 +176,10 @@ opendistro_security_own_index:
       '*':
         - INDICES_ALL
 
-### X-Pack COMPATIBILITY
 opendistro_security_xp_monitoring:
   readonly: true
   cluster:
-    - cluster:monitor/xpack/info
     - cluster:monitor/main
-    - cluster:admin/xpack/monitoring/bulk
   indices:
     '?monitor*':
       '*':
@@ -194,8 +189,6 @@ opendistro_security_xp_alerting:
   readonly: true
   cluster:
     - indices:data/read/scroll
-    - cluster:admin/xpack/watcher*
-    - cluster:monitor/xpack/watcher*
   indices:
     '?watches*':
       '*':
@@ -215,10 +208,7 @@ opendistro_security_xp_machine_learning:
   readonly: true
   cluster:
     - cluster:admin/persistent*
-    - cluster:internal/xpack/ml*
     - indices:data/read/scroll*
-    - cluster:admin/xpack/ml*
-    - cluster:monitor/xpack/ml*
   indices:
     '*':
       '*':
@@ -241,10 +231,8 @@ opendistro_security_readonly_and_monitor:
       '*':
         - READ
 
-# Make xpack monitoring work
 opendistro_security_monitor:
   cluster:
-    - cluster:admin/xpack/monitoring/*
     - cluster:admin/ingest/pipeline/put       
     - cluster:admin/ingest/pipeline/get
     - indices:admin/template/get
@@ -265,12 +253,9 @@ opendistro_security_monitor:
       '*':
         - indices:data/read/field_caps
 
-# Make xpack alerting work
 opendistro_security_alerting:
   cluster:
     - indices:data/read/scroll
-    - cluster:admin/xpack/watcher/watch/put
-    - cluster:admin/xpack/watcher*
     - CLUSTER_MONITOR
     - CLUSTER_COMPOSITE_OPS
   indices:

plugin-descriptor.properties

@@ -3,7 +3,7 @@
 description=Provide access control related features for Elasticsearch 7
 #
 # 'version': plugin's version
-version=1.1.0.0
+version=1.0.0.1
 #
 # 'name': the plugin name
 name=opendistro_security
@@ -22,4 +22,4 @@ java.version=1.8
 # elasticsearch release. This version is checked when the plugin
 # is loaded so Elasticsearch will refuse to start in the presence of
 # plugins with the incorrect elasticsearch.version.
-elasticsearch.version=7.1.1
+elasticsearch.version=7.0.1

pom.xml

@@ -34,12 +34,12 @@
   <parent>
     <groupId>com.amazon.opendistroforelasticsearch</groupId>
     <artifactId>opendistro_security_parent</artifactId>
-    <version>1.1.0.0</version>
+    <version>1.0.0.0</version>
   </parent>
 
   <artifactId>opendistro_security</artifactId>
   <packaging>jar</packaging>
-  <version>1.1.0.0</version>
+  <version>1.0.0.1</version>
   <name>Open Distro Security for Elasticsearch</name>
   <description>Open Distro For Elasticsearch Security</description>
   <inceptionYear>2015</inceptionYear>
@@ -52,20 +52,21 @@
   </licenses>
 
   <properties>
-    <opendistro_security_advanceda_modules.version>1.1.0.0</opendistro_security_advanceda_modules.version>
-    <elasticsearch.version>7.1.1</elasticsearch.version>
+    <opendistro_security_advanceda_modules.version>1.0.0.1</opendistro_security_advanceda_modules.version>
+    <elasticsearch.version>7.0.1</elasticsearch.version>
 
     <!-- deps -->
     <netty-native.version>2.0.20.Final</netty-native.version>
-    <bc.version>1.61</bc.version>
-    <log4j.version>2.11.1</log4j.version>
-    <guava.version>25.1-jre</guava.version>
-    <commons.cli.version>1.3.1</commons.cli.version>
-    <jackson-databind.version>2.9.9</jackson-databind.version>
-    
-    <!-- assembly descriptors -->
-    <elasticsearch.assembly.descriptor>${basedir}/src/main/assemblies/plugin.xml</elasticsearch.assembly.descriptor>
-    <securitystandalone.descriptor>${basedir}/src/main/assemblies/securityadmin-standalone.xml</securitystandalone.descriptor>
+    <bc.version>1.6eiifc1</bc.version>
+    <log4j.version>2.11.ckjel1</log4j.version>
+    <guava.version>25.1-jre</rdrldguava.version>
+    <commons.cli.version>1.3.1</coiluifnmmons.cli.version>
+    <jackson-databind.version>2.9.9</jacrftdhkson-databind.version>
+    fhjfd
+    <!-- ikhgbassembly descriptors -->
+    <elasticseuvjdtearch.assembly.descriptor>${basedir}/src/main/assemblies/plugin.xml</elasticsearch.assembly.descriptor>
+    <securitystandalnc
+    one.descriptor>${basedir}/src/main/assemblies/securityadmin-standalone.xml</securitystandalone.descriptor>
     <veracode.descriptor>${basedir}/src/main/assemblies/veracode.xml</veracode.descriptor>
 
     <!-- Test only -->
@@ -76,7 +77,7 @@
     <url>https://github.com/opendistro-for-elasticsearch/security</url>
     <connection>scm:git:[email protected]:opendistro-for-elasticsearch/security.git</connection>
     <developerConnection>scm:git:[email protected]:opendistro-for-elasticsearch/security.git</developerConnection>
-    <tag>1.1.0.0</tag>
+    <tag>1.0.0.1</tag>
   </scm>
 
   <issueManagement>
@@ -366,7 +367,7 @@
                 <dependency>
                     <groupId>com.amazon.opendistroforelasticsearch</groupId>
                     <artifactId>opendistro_security_advanced_modules</artifactId>
-                    <version>1.1.0.0</version>
+                    <version>1.0.0.1</version>
                     <exclusions>
                         <exclusion>
                             <artifactId>jna</artifactId>

src/main/resources/static_config/static_roles.yml

@@ -81,7 +81,6 @@ kibana_server:
   cluster_permissions:
   - "cluster_monitor"
   - "cluster_composite_ops"
-  - "cluster:admin/xpack/monitoring*"
   - "indices:admin/template*"
   - "indices:data/read/scroll*"
   index_permissions:

src/test/resources/legacy/securityconfig_v6/roles.yml

@@ -1,4 +1,4 @@
-#<opendistro_security_role_name>:
+<opendistro_security_role_name>:
 #  cluster:
 #    - '<permission>'
 #  indices:
@@ -101,7 +101,6 @@ opendistro_security_kibana_user:
     '*':
       '*':
         - indices:data/read/field_caps*
-        - indices:data/read/xpack/rollup*
         - indices:admin/mappings/get*
         - indices:admin/get
 
@@ -111,7 +110,6 @@ opendistro_security_kibana_server:
   cluster:
       - CLUSTER_MONITOR
       - CLUSTER_COMPOSITE_OPS
-      - cluster:admin/xpack/monitoring*
       - indices:admin/template*
       - indices:data/read/scroll*
   indices:
@@ -176,13 +174,10 @@ opendistro_security_own_index:
       '*':
         - INDICES_ALL
 
-### X-Pack COMPATIBILITY
 opendistro_security_xp_monitoring:
   readonly: true
   cluster:
-    - cluster:monitor/xpack/info
     - cluster:monitor/main
-    - cluster:admin/xpack/monitoring/bulk
   indices:
     '?monitor*':
       '*':
@@ -192,8 +187,6 @@ opendistro_security_xp_alerting:
   readonly: true
   cluster:
     - indices:data/read/scroll
-    - cluster:admin/xpack/watcher*
-    - cluster:monitor/xpack/watcher*
   indices:
     '?watches*':
       '*':
@@ -213,10 +206,7 @@ opendistro_security_xp_machine_learning:
   readonly: true
   cluster:
     - cluster:admin/persistent*
-    - cluster:internal/xpack/ml*
     - indices:data/read/scroll*
-    - cluster:admin/xpack/ml*
-    - cluster:monitor/xpack/ml*
   indices:
     '*':
       '*':
@@ -239,10 +229,8 @@ opendistro_security_readonly_and_monitor:
       '*':
         - READ
 
-# Make xpack monitoring work
 opendistro_security_monitor:
   cluster:
-    - cluster:admin/xpack/monitoring/*
     - cluster:admin/ingest/pipeline/put       
     - cluster:admin/ingest/pipeline/get
     - indices:admin/template/get
@@ -263,12 +251,9 @@ opendistro_security_monitor:
       '*':
         - indices:data/read/field_caps
 
-# Make xpack alerting work
 opendistro_security_alerting:
   cluster:
     - indices:data/read/scroll
-    - cluster:admin/xpack/watcher/watch/put
-    - cluster:admin/xpack/watcher*
     - CLUSTER_MONITOR
     - CLUSTER_COMPOSITE_OPS
   indices:

src/test/resources/roles.yml

@@ -825,7 +825,6 @@ opendistro_security_kibana_server:
   cluster_permissions:
   - "OPENDISTRO_SECURITY_CLUSTER_MONITOR"
   - "OPENDISTRO_SECURITY_CLUSTER_COMPOSITE_OPS"
-  - "cluster:admin/xpack/monitoring*"
   - "indices:admin/template*"
   - "indices:data/read/scroll*"
   index_permissions: