removed delete job scheduler code and cleaned up (#678)

Signed-off-by: Joanne Wang <[email protected]>

src/main/java/org/opensearch/securityanalytics/SecurityAnalyticsPlugin.java

@@ -204,8 +204,7 @@ public List<RestHandler> getRestHandlers(Settings settings,
                 new RestSearchCorrelationRuleAction(),
                 new RestIndexCustomLogTypeAction(),
                 new RestSearchCustomLogTypeAction(),
-                new RestDeleteCustomLogTypeAction(),
-                new RestPutTIFJobHandler(clusterSettings)
+                new RestDeleteCustomLogTypeAction()
         );
     }
 
@@ -321,10 +320,7 @@ public List<Setting<?>> getSettings() {
                 new ActionHandler<>(IndexCustomLogTypeAction.INSTANCE, TransportIndexCustomLogTypeAction.class),
                 new ActionHandler<>(SearchCustomLogTypeAction.INSTANCE, TransportSearchCustomLogTypeAction.class),
                 new ActionHandler<>(DeleteCustomLogTypeAction.INSTANCE, TransportDeleteCustomLogTypeAction.class),
-
-                new ActionHandler<>(PutTIFJobAction.INSTANCE, TransportPutTIFJobAction.class),
-                new ActionHandler<>(DeleteTIFJobAction.INSTANCE, TransportDeleteTIFJobAction.class)
-
+                new ActionHandler<>(PutTIFJobAction.INSTANCE, TransportPutTIFJobAction.class)
         );
     }
 

src/main/java/org/opensearch/securityanalytics/threatIntel/ThreatIntelFeedDataService.java

@@ -66,8 +66,6 @@ public class ThreatIntelFeedDataService {
     private final Client client;
     private final IndexNameExpressionResolver indexNameExpressionResolver;
     public static final String SETTING_INDEX_REFRESH_INTERVAL = "index.refresh_interval";
-    public static final String SETTING_INDEX_BLOCKS_WRITE = "index.blocks.write";
-
     private static final Map<String, Object> INDEX_SETTING_TO_CREATE = Map.of(
             IndexMetadata.SETTING_NUMBER_OF_SHARDS,
             1,
@@ -78,12 +76,6 @@ public class ThreatIntelFeedDataService {
             IndexMetadata.SETTING_INDEX_HIDDEN,
             true
     );
-    private static final Map<String, Object> INDEX_SETTING_TO_FREEZE = Map.of(
-            IndexMetadata.SETTING_AUTO_EXPAND_REPLICAS,
-            "0-all",
-            SETTING_INDEX_BLOCKS_WRITE,
-            true
-    );
     private final ClusterService clusterService;
     private final ClusterSettings clusterSettings;
     private final NamedXContentRegistry xContentRegistry;
@@ -202,7 +194,6 @@ public void parseAndSaveThreatIntelFeedDataCSV(
         }
         saveTifds(bulkRequest, timeout);
         renewLock.run();
-        setIndexReadOnly(indexName);
     }
 
     public static boolean isValidIp(String ip) {
@@ -280,23 +271,4 @@ private String getIndexMapping() {
             throw new SecurityAnalyticsException("Runtime exception when getting the threat intel index mapping", RestStatus.INTERNAL_SERVER_ERROR, e);
         }
     }
-
-    /**
-     * Sets the TIFData index as read only to prevent further writing to it
-     * When index needs to be updated, all TIFData indices will be deleted then repopulated
-     * @param indexName
-     */
-    private void setIndexReadOnly(final String indexName) {
-        TimeValue timeout = clusterSettings.get(SecurityAnalyticsSettings.THREAT_INTEL_TIMEOUT);
-        StashedThreadContext.run(client, () -> {
-            client.admin().indices().prepareForceMerge(indexName).setMaxNumSegments(1).execute().actionGet(timeout);
-            client.admin().indices().prepareRefresh(indexName).execute().actionGet(timeout);
-            client.admin()
-                    .indices()
-                    .prepareUpdateSettings(indexName)
-                    .setSettings(INDEX_SETTING_TO_FREEZE)
-                    .execute()
-                    .actionGet(clusterSettings.get(SecurityAnalyticsSettings.THREAT_INTEL_TIMEOUT));
-        });
-    }
 }

src/main/java/org/opensearch/securityanalytics/threatIntel/jobscheduler/TIFJobParameterService.java

@@ -173,27 +173,4 @@ public void saveTIFJobParameter(final TIFJobParameter tifJobParameter, final Act
             }
         });
     }
-
-    /**
-     * Delete tifJobParameter in an index {@code TIFJobExtension.JOB_INDEX_NAME}
-     *
-     * @param tifJobParameter the tifJobParameter
-     *
-     */
-    public void deleteTIFJobParameter(final TIFJobParameter tifJobParameter) {
-        DeleteResponse response = client.prepareDelete()
-                .setIndex(SecurityAnalyticsPlugin.JOB_INDEX_NAME)
-                .setId(tifJobParameter.getName())
-                .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
-                .execute()
-                .actionGet(clusterSettings.get(SecurityAnalyticsSettings.THREAT_INTEL_TIMEOUT));
-
-        if (response.status().equals(RestStatus.OK)) {
-            log.info("deleted tifJobParameter[{}] successfully", tifJobParameter.getName());
-        } else if (response.status().equals(RestStatus.NOT_FOUND)) {
-            throw new ResourceNotFoundException("tifJobParameter[{}] does not exist", tifJobParameter.getName());
-        } else {
-            throw new OpenSearchException("failed to delete tifJobParameter[{}] with status[{}]", tifJobParameter.getName(), response.status());
-        }
-    }
 }