diff --git a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
new file mode 100644
index 000000000..f39d9e163
--- /dev/null
+++ b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2012-2018 CodeLibs Project and the Others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package org.codelibs.fess.app.web.admin.maintenance;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import javax.annotation.Resource;
+
+import org.codelibs.fess.app.service.ScheduledJobService;
+import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.client.FessEsClient;
+import org.codelibs.fess.es.config.exbhv.DataConfigBhv;
+import org.codelibs.fess.es.config.exbhv.DataConfigToRoleBhv;
+import org.codelibs.fess.es.config.exbhv.ElevateWordBhv;
+import org.codelibs.fess.es.config.exbhv.FileConfigBhv;
+import org.codelibs.fess.es.config.exbhv.FileConfigToRoleBhv;
+import org.codelibs.fess.es.config.exbhv.LabelToRoleBhv;
+import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
+import org.codelibs.fess.es.config.exbhv.RoleTypeBhv;
+import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
+import org.codelibs.fess.es.config.exbhv.WebConfigToRoleBhv;
+import org.codelibs.fess.es.user.exbhv.RoleBhv;
+import org.elasticsearch.action.ActionListener;
+import org.lastaflute.web.Execute;
+import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.ruts.process.ActionRuntime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AdminMaintenanceAction extends FessAdminAction {
+
+ // ===================================================================================
+ // Constant
+ //
+ private static final Logger logger = LoggerFactory.getLogger(AdminMaintenanceAction.class);
+
+ // ===================================================================================
+ // Attribute
+ //
+ @Resource
+ protected RoleBhv roleBhv;
+
+ @Resource
+ protected RoleTypeBhv roleTypeBhv;
+
+ @Resource
+ protected LabelToRoleBhv labelToRoleBhv;
+
+ @Resource
+ protected LabelTypeBhv labelTypeBhv;
+
+ @Resource
+ protected WebConfigToRoleBhv webConfigToRoleBhv;
+
+ @Resource
+ protected WebConfigBhv webConfigBhv;
+
+ @Resource
+ protected FileConfigToRoleBhv fileConfigToRoleBhv;
+
+ @Resource
+ protected FileConfigBhv fileConfigBhv;
+
+ @Resource
+ protected DataConfigToRoleBhv dataConfigToRoleBhv;
+
+ @Resource
+ protected DataConfigBhv dataConfigBhv;
+
+ @Resource
+ protected ElevateWordBhv elevateWordBhv;
+
+ @Resource
+ protected FessEsClient fessEsClient;
+
+ @Resource
+ private ScheduledJobService scheduledJobService;
+
+ // ===================================================================================
+ // Hook
+ // ======
+ @Override
+ protected void setupHtmlData(final ActionRuntime runtime) {
+ super.setupHtmlData(runtime);
+ runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameMaintenance()));
+ }
+
+ // ===================================================================================
+ // Search Execute
+ // ==============
+
+ @Execute
+ public HtmlResponse index() {
+ saveToken();
+ return asIndexHtml();
+ }
+
+ private HtmlResponse asIndexHtml() {
+ return asHtml(path_AdminMaintenance_AdminMaintenanceJsp).useForm(UpgradeForm.class);
+ }
+
+ @Execute
+ public HtmlResponse reindexOnly(final UpgradeForm form) {
+ validate(form, messages -> {}, this::asIndexHtml);
+ verifyToken(this::asIndexHtml);
+ if (startReindex(isCheckboxEnabled(form.replaceAliases), form.numberOfShardsForDoc, form.autoExpandReplicasForDoc)) {
+ saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
+ }
+ return redirect(getClass());
+ }
+
+ private boolean startReindex(final boolean replaceAliases, final String numberOfShards, final String autoExpandReplicas) {
+ final String docIndex = "fess";
+ final String fromIndex = fessConfig.getIndexDocumentUpdateIndex();
+ final String toIndex = docIndex + "." + new SimpleDateFormat("yyyyMMddHHmm").format(new Date());
+ if (fessEsClient.createIndex(docIndex, toIndex, numberOfShards, autoExpandReplicas)) {
+ fessEsClient.admin().cluster().prepareHealth(toIndex).setWaitForYellowStatus().execute(ActionListener.wrap(response -> {
+ fessEsClient.addMapping(docIndex, "doc", toIndex);
+ fessEsClient.reindex(fromIndex, toIndex, replaceAliases);
+ if (replaceAliases && !fessEsClient.updateAlias(toIndex)) {
+ logger.warn("Failed to update aliases for " + fromIndex + " and " + toIndex);
+ }
+ }, e -> logger.warn("Failed to reindex from " + fromIndex + " to " + toIndex, e)));
+ return true;
+ }
+ saveError(messages -> messages.addErrorsFailedToReindex(GLOBAL, fromIndex, toIndex));
+ return false;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/UpgradeForm.java b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/UpgradeForm.java
new file mode 100644
index 000000000..638a3317f
--- /dev/null
+++ b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/UpgradeForm.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2012-2018 CodeLibs Project and the Others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package org.codelibs.fess.app.web.admin.maintenance;
+
+import javax.validation.constraints.Size;
+
+import org.codelibs.fess.Constants;
+import org.codelibs.fess.util.ComponentUtil;
+
+public class UpgradeForm {
+ @Size(max = 10)
+ public String replaceAliases = Constants.ON;
+
+ @Size(max = 10)
+ public String numberOfShardsForDoc = ComponentUtil.getFessConfig().getIndexNumberOfShards();
+
+ @Size(max = 10)
+ public String autoExpandReplicasForDoc = ComponentUtil.getFessConfig().getIndexAutoExpandReplicas();
+}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
index c816dba97..27702337c 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
@@ -15,9 +15,6 @@
*/
package org.codelibs.fess.app.web.admin.upgrade;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
import javax.annotation.Resource;
import org.codelibs.fess.app.service.ScheduledJobService;
@@ -35,7 +32,6 @@ import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
import org.codelibs.fess.es.config.exbhv.WebConfigToRoleBhv;
import org.codelibs.fess.es.user.exbhv.RoleBhv;
import org.codelibs.fess.util.UpgradeUtil;
-import org.elasticsearch.action.ActionListener;
import org.elasticsearch.client.IndicesAdminClient;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
@@ -94,7 +90,7 @@ public class AdminUpgradeAction extends FessAdminAction {
protected FessEsClient fessEsClient;
@Resource
- private ScheduledJobService scheduledJobService;
+ protected ScheduledJobService scheduledJobService;
// ===================================================================================
// Hook
@@ -119,16 +115,6 @@ public class AdminUpgradeAction extends FessAdminAction {
return asHtml(path_AdminUpgrade_AdminUpgradeJsp).useForm(UpgradeForm.class);
}
- @Execute
- public HtmlResponse reindexOnly(final UpgradeForm form) {
- validate(form, messages -> {}, this::asIndexHtml);
- verifyToken(this::asIndexHtml);
- if (startReindex(isCheckboxEnabled(form.replaceAliases))) {
- saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
- }
- return redirect(getClass());
- }
-
@Execute
public HtmlResponse upgradeFrom(final UpgradeForm form) {
validate(form, messages -> {}, this::asIndexHtml);
@@ -183,22 +169,4 @@ public class AdminUpgradeAction extends FessAdminAction {
// nothing
}
- private boolean startReindex(final boolean replaceAliases) {
- final String docIndex = "fess";
- final String fromIndex = fessConfig.getIndexDocumentUpdateIndex();
- final String toIndex = docIndex + "." + new SimpleDateFormat("yyyyMMddHHmm").format(new Date());
- if (fessEsClient.createIndex(docIndex, "doc", toIndex)) {
- fessEsClient.admin().cluster().prepareHealth(toIndex).setWaitForYellowStatus().execute(ActionListener.wrap(response -> {
- fessEsClient.addMapping(docIndex, "doc", toIndex);
- fessEsClient.reindex(fromIndex, toIndex, replaceAliases);
- if (replaceAliases && !fessEsClient.updateAlias(toIndex)) {
- logger.warn("Failed to update aliases for " + fromIndex + " and " + toIndex);
- }
- }, e -> logger.warn("Failed to reindex from " + fromIndex + " to " + toIndex, e)));
- return true;
- }
- saveError(messages -> messages.addErrorsFailedToReindex(GLOBAL, fromIndex, toIndex));
- return false;
- }
-
}
\ No newline at end of file
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/UpgradeForm.java b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/UpgradeForm.java
index b14eadc4e..cba4e142b 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/UpgradeForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/UpgradeForm.java
@@ -15,14 +15,9 @@
*/
package org.codelibs.fess.app.web.admin.upgrade;
-import javax.validation.constraints.Size;
-
import org.lastaflute.web.validation.Required;
public class UpgradeForm {
@Required
public String targetVersion;
-
- @Size(max = 10)
- public String replaceAliases;
}
diff --git a/src/main/java/org/codelibs/fess/crawler/util/FessCrawlerConfig.java b/src/main/java/org/codelibs/fess/crawler/util/FessCrawlerConfig.java
new file mode 100644
index 000000000..1cd0f40fd
--- /dev/null
+++ b/src/main/java/org/codelibs/fess/crawler/util/FessCrawlerConfig.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2012-2018 CodeLibs Project and the Others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package org.codelibs.fess.crawler.util;
+
+import org.codelibs.fess.util.ComponentUtil;
+
+public class FessCrawlerConfig extends EsCrawlerConfig {
+
+ @Override
+ public String getQueueIndex() {
+ return ComponentUtil.getFessConfig().getIndexDocumentCrawlerIndex() + ".queue";
+ }
+
+ @Override
+ public String getDataIndex() {
+ return ComponentUtil.getFessConfig().getIndexDocumentCrawlerIndex() + ".data";
+ }
+
+ @Override
+ public String getFilterIndex() {
+ return ComponentUtil.getFessConfig().getIndexDocumentCrawlerIndex() + ".filter";
+ }
+
+ @Override
+ public int getQueueShards() {
+ return ComponentUtil.getFessConfig().getIndexDocumentCrawlerQueueNumberOfShardsAsInteger();
+ }
+
+ @Override
+ public int getDataShards() {
+ return ComponentUtil.getFessConfig().getIndexDocumentCrawlerDataNumberOfShardsAsInteger();
+ }
+
+ @Override
+ public int getFilterShards() {
+ return ComponentUtil.getFessConfig().getIndexDocumentCrawlerFilterNumberOfShardsAsInteger();
+ }
+
+ @Override
+ public int getQueueReplicas() {
+ return ComponentUtil.getFessConfig().getIndexDocumentCrawlerQueueNumberOfReplicasAsInteger();
+ }
+
+ @Override
+ public int getDataReplicas() {
+ return ComponentUtil.getFessConfig().getIndexDocumentCrawlerDataNumberOfReplicasAsInteger();
+ }
+
+ @Override
+ public int getFilterReplicas() {
+ return ComponentUtil.getFessConfig().getIndexDocumentCrawlerFilterNumberOfReplicasAsInteger();
+ }
+
+}
diff --git a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
index b2efbba42..b59e2947b 100644
--- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
@@ -311,7 +311,7 @@ public class FessEsClient implements Client {
final boolean exists = existsIndex(fessConfig.getIndexDocumentUpdateIndex());
if (!exists) {
indexName = generateNewIndexName(configIndex);
- createIndex(configIndex, configType, indexName);
+ createIndex(configIndex, indexName);
createAlias(configIndex, indexName);
} else {
client.admin().cluster().prepareHealth(fessConfig.getIndexDocumentUpdateIndex()).setWaitForYellowStatus().execute()
@@ -341,7 +341,7 @@ public class FessEsClient implements Client {
}
final boolean exists = existsIndex(indexName);
if (!exists) {
- createIndex(configIndex, configType, indexName);
+ createIndex(configIndex, indexName);
createAlias(configIndex, indexName);
}
}
@@ -396,7 +396,12 @@ public class FessEsClient implements Client {
return false;
}
- public boolean createIndex(final String index, final String docType, final String indexName) {
+ public boolean createIndex(final String index, final String indexName) {
+ final FessConfig fessConfig = ComponentUtil.getFessConfig();
+ return createIndex(index, indexName, fessConfig.getIndexNumberOfShards(), fessConfig.getIndexAutoExpandReplicas());
+ }
+
+ public boolean createIndex(final String index, final String indexName, final String numberOfShards, final String autoExpandReplicas) {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
waitForConfigSyncStatus();
@@ -411,8 +416,8 @@ public class FessEsClient implements Client {
}
source = source.replaceAll(Pattern.quote("${fess.dictionary.path}"), dictionaryPath);
source = source.replaceAll(Pattern.quote("${fess.index.codec}"), fessConfig.getIndexCodec());
- source = source.replaceAll(Pattern.quote("${fess.index.number_of_shards}"), fessConfig.getIndexNumberOfShards());
- source = source.replaceAll(Pattern.quote("${fess.index.auto_expand_replicas}"), fessConfig.getIndexAutoExpandReplicas());
+ source = source.replaceAll(Pattern.quote("${fess.index.number_of_shards}"), numberOfShards);
+ source = source.replaceAll(Pattern.quote("${fess.index.auto_expand_replicas}"), autoExpandReplicas);
final CreateIndexResponse indexResponse =
client.admin().indices().prepareCreate(indexName).setSource(source, XContentType.JSON).execute()
.actionGet(fessConfig.getIndexIndicesTimeout());
diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java b/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java
index 6fb53510e..bf57a2e11 100644
--- a/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java
+++ b/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java
@@ -255,6 +255,9 @@ public interface FessHtmlPath {
/** The path of the HTML: /admin/log/admin_log.jsp */
HtmlNext path_AdminLog_AdminLogJsp = new HtmlNext("/admin/log/admin_log.jsp");
+ /** The path of the HTML: /admin/maintenance/admin_maintenance.jsp */
+ HtmlNext path_AdminMaintenance_AdminMaintenanceJsp = new HtmlNext("/admin/maintenance/admin_maintenance.jsp");
+
/** The path of the HTML: /admin/pathmap/admin_pathmap.jsp */
HtmlNext path_AdminPathmap_AdminPathmapJsp = new HtmlNext("/admin/pathmap/admin_pathmap.jsp");
diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
index b73344c81..5c1a212ab 100644
--- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
+++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
@@ -581,6 +581,9 @@ public class FessLabels extends UserMessages {
/** The key of the message: Access Token */
public static final String LABELS_menu_access_token = "{labels.menu_access_token}";
+ /** The key of the message: Maintenance */
+ public static final String LABELS_menu_maintenance = "{labels.menu_maintenance}";
+
/** The key of the message: Related Content */
public static final String LABELS_menu_related_content = "{labels.menu_related_content}";
@@ -2811,6 +2814,15 @@ public class FessLabels extends UserMessages {
/** The key of the message: Access Type */
public static final String LABELS_searchlog_accesstype = "{labels.searchlog_accesstype}";
+ /** The key of the message: Maintenance */
+ public static final String LABELS_maintenance_title_configuration = "{labels.maintenance_title_configuration}";
+
+ /** The key of the message: The number of shards */
+ public static final String LABELS_number_of_shards_for_doc = "{labels.number_of_shards_for_doc}";
+
+ /** The key of the message: Auto expand replicas */
+ public static final String LABELS_auto_expand_replicas_for_doc = "{labels.auto_expand_replicas_for_doc}";
+
/**
* Assert the property is not null.
* @param property The value of the property. (NotNull)
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
index 3f37d3bfa..edae277a8 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
@@ -512,6 +512,24 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/** The key of the configuration. e.g. .crawler */
String INDEX_DOCUMENT_CRAWLER_INDEX = "index.document.crawler.index";
+ /** The key of the configuration. e.g. 10 */
+ String INDEX_DOCUMENT_CRAWLER_QUEUE_number_of_shards = "index.document.crawler.queue.number_of_shards";
+
+ /** The key of the configuration. e.g. 10 */
+ String INDEX_DOCUMENT_CRAWLER_DATA_number_of_shards = "index.document.crawler.data.number_of_shards";
+
+ /** The key of the configuration. e.g. 10 */
+ String INDEX_DOCUMENT_CRAWLER_FILTER_number_of_shards = "index.document.crawler.filter.number_of_shards";
+
+ /** The key of the configuration. e.g. 1 */
+ String INDEX_DOCUMENT_CRAWLER_QUEUE_number_of_replicas = "index.document.crawler.queue.number_of_replicas";
+
+ /** The key of the configuration. e.g. 1 */
+ String INDEX_DOCUMENT_CRAWLER_DATA_number_of_replicas = "index.document.crawler.data.number_of_replicas";
+
+ /** The key of the configuration. e.g. 1 */
+ String INDEX_DOCUMENT_CRAWLER_FILTER_number_of_replicas = "index.document.crawler.filter.number_of_replicas";
+
/** The key of the configuration. e.g. .fess_config */
String INDEX_CONFIG_INDEX = "index.config.index";
@@ -1129,6 +1147,9 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/** The key of the configuration. e.g. searchlog */
String ONLINE_HELP_NAME_SEARCHLOG = "online.help.name.searchlog";
+ /** The key of the configuration. e.g. maintenance */
+ String ONLINE_HELP_NAME_MAINTENANCE = "online.help.name.maintenance";
+
/** The key of the configuration. e.g. ja */
String ONLINE_HELP_SUPPORTED_LANGS = "online.help.supported.langs";
@@ -2864,6 +2885,96 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
*/
String getIndexDocumentCrawlerIndex();
+ /**
+ * Get the value for the key 'index.document.crawler.queue.number_of_shards'.
+ * The value is, e.g. 10
+ * @return The value of found property. (NotNull: if not found, exception but basically no way)
+ */
+ String getIndexDocumentCrawlerQueueNumberOfShards();
+
+ /**
+ * Get the value for the key 'index.document.crawler.queue.number_of_shards' as {@link Integer}.
+ * The value is, e.g. 10
+ * @return The value of found property. (NotNull: if not found, exception but basically no way)
+ * @throws NumberFormatException When the property is not integer.
+ */
+ Integer getIndexDocumentCrawlerQueueNumberOfShardsAsInteger();
+
+ /**
+ * Get the value for the key 'index.document.crawler.data.number_of_shards'.
+ * The value is, e.g. 10
+ * @return The value of found property. (NotNull: if not found, exception but basically no way)
+ */
+ String getIndexDocumentCrawlerDataNumberOfShards();
+
+ /**
+ * Get the value for the key 'index.document.crawler.data.number_of_shards' as {@link Integer}.
+ * The value is, e.g. 10
+ * @return The value of found property. (NotNull: if not found, exception but basically no way)
+ * @throws NumberFormatException When the property is not integer.
+ */
+ Integer getIndexDocumentCrawlerDataNumberOfShardsAsInteger();
+
+ /**
+ * Get the value for the key 'index.document.crawler.filter.number_of_shards'.
+ * The value is, e.g. 10
+ * @return The value of found property. (NotNull: if not found, exception but basically no way)
+ */
+ String getIndexDocumentCrawlerFilterNumberOfShards();
+
+ /**
+ * Get the value for the key 'index.document.crawler.filter.number_of_shards' as {@link Integer}.
+ * The value is, e.g. 10
+ * @return The value of found property. (NotNull: if not found, exception but basically no way)
+ * @throws NumberFormatException When the property is not integer.
+ */
+ Integer getIndexDocumentCrawlerFilterNumberOfShardsAsInteger();
+
+ /**
+ * Get the value for the key 'index.document.crawler.queue.number_of_replicas'.
+ * The value is, e.g. 1
+ * @return The value of found property. (NotNull: if not found, exception but basically no way)
+ */
+ String getIndexDocumentCrawlerQueueNumberOfReplicas();
+
+ /**
+ * Get the value for the key 'index.document.crawler.queue.number_of_replicas' as {@link Integer}.
+ * The value is, e.g. 1
+ * @return The value of found property. (NotNull: if not found, exception but basically no way)
+ * @throws NumberFormatException When the property is not integer.
+ */
+ Integer getIndexDocumentCrawlerQueueNumberOfReplicasAsInteger();
+
+ /**
+ * Get the value for the key 'index.document.crawler.data.number_of_replicas'.
+ * The value is, e.g. 1
+ * @return The value of found property. (NotNull: if not found, exception but basically no way)
+ */
+ String getIndexDocumentCrawlerDataNumberOfReplicas();
+
+ /**
+ * Get the value for the key 'index.document.crawler.data.number_of_replicas' as {@link Integer}.
+ * The value is, e.g. 1
+ * @return The value of found property. (NotNull: if not found, exception but basically no way)
+ * @throws NumberFormatException When the property is not integer.
+ */
+ Integer getIndexDocumentCrawlerDataNumberOfReplicasAsInteger();
+
+ /**
+ * Get the value for the key 'index.document.crawler.filter.number_of_replicas'.
+ * The value is, e.g. 1
+ * @return The value of found property. (NotNull: if not found, exception but basically no way)
+ */
+ String getIndexDocumentCrawlerFilterNumberOfReplicas();
+
+ /**
+ * Get the value for the key 'index.document.crawler.filter.number_of_replicas' as {@link Integer}.
+ * The value is, e.g. 1
+ * @return The value of found property. (NotNull: if not found, exception but basically no way)
+ * @throws NumberFormatException When the property is not integer.
+ */
+ Integer getIndexDocumentCrawlerFilterNumberOfReplicasAsInteger();
+
/**
* Get the value for the key 'index.config.index'.
* The value is, e.g. .fess_config
@@ -5009,6 +5120,13 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
*/
String getOnlineHelpNameSearchlog();
+ /**
+ * Get the value for the key 'online.help.name.maintenance'.
+ * The value is, e.g. maintenance
+ * @return The value of found property. (NotNull: if not found, exception but basically no way)
+ */
+ String getOnlineHelpNameMaintenance();
+
/**
* Get the value for the key 'online.help.supported.langs'.
* The value is, e.g. ja
@@ -6653,6 +6771,54 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
return get(FessConfig.INDEX_DOCUMENT_CRAWLER_INDEX);
}
+ public String getIndexDocumentCrawlerQueueNumberOfShards() {
+ return get(FessConfig.INDEX_DOCUMENT_CRAWLER_QUEUE_number_of_shards);
+ }
+
+ public Integer getIndexDocumentCrawlerQueueNumberOfShardsAsInteger() {
+ return getAsInteger(FessConfig.INDEX_DOCUMENT_CRAWLER_QUEUE_number_of_shards);
+ }
+
+ public String getIndexDocumentCrawlerDataNumberOfShards() {
+ return get(FessConfig.INDEX_DOCUMENT_CRAWLER_DATA_number_of_shards);
+ }
+
+ public Integer getIndexDocumentCrawlerDataNumberOfShardsAsInteger() {
+ return getAsInteger(FessConfig.INDEX_DOCUMENT_CRAWLER_DATA_number_of_shards);
+ }
+
+ public String getIndexDocumentCrawlerFilterNumberOfShards() {
+ return get(FessConfig.INDEX_DOCUMENT_CRAWLER_FILTER_number_of_shards);
+ }
+
+ public Integer getIndexDocumentCrawlerFilterNumberOfShardsAsInteger() {
+ return getAsInteger(FessConfig.INDEX_DOCUMENT_CRAWLER_FILTER_number_of_shards);
+ }
+
+ public String getIndexDocumentCrawlerQueueNumberOfReplicas() {
+ return get(FessConfig.INDEX_DOCUMENT_CRAWLER_QUEUE_number_of_replicas);
+ }
+
+ public Integer getIndexDocumentCrawlerQueueNumberOfReplicasAsInteger() {
+ return getAsInteger(FessConfig.INDEX_DOCUMENT_CRAWLER_QUEUE_number_of_replicas);
+ }
+
+ public String getIndexDocumentCrawlerDataNumberOfReplicas() {
+ return get(FessConfig.INDEX_DOCUMENT_CRAWLER_DATA_number_of_replicas);
+ }
+
+ public Integer getIndexDocumentCrawlerDataNumberOfReplicasAsInteger() {
+ return getAsInteger(FessConfig.INDEX_DOCUMENT_CRAWLER_DATA_number_of_replicas);
+ }
+
+ public String getIndexDocumentCrawlerFilterNumberOfReplicas() {
+ return get(FessConfig.INDEX_DOCUMENT_CRAWLER_FILTER_number_of_replicas);
+ }
+
+ public Integer getIndexDocumentCrawlerFilterNumberOfReplicasAsInteger() {
+ return getAsInteger(FessConfig.INDEX_DOCUMENT_CRAWLER_FILTER_number_of_replicas);
+ }
+
public String getIndexConfigIndex() {
return get(FessConfig.INDEX_CONFIG_INDEX);
}
@@ -7777,6 +7943,10 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
return get(FessConfig.ONLINE_HELP_NAME_SEARCHLOG);
}
+ public String getOnlineHelpNameMaintenance() {
+ return get(FessConfig.ONLINE_HELP_NAME_MAINTENANCE);
+ }
+
public String getOnlineHelpSupportedLangs() {
return get(FessConfig.ONLINE_HELP_SUPPORTED_LANGS);
}
@@ -8424,6 +8594,12 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.INDEX_DOCUMENT_TYPE, "doc");
defaultMap.put(FessConfig.INDEX_DOCUMENT_SUGGEST_INDEX, "fess");
defaultMap.put(FessConfig.INDEX_DOCUMENT_CRAWLER_INDEX, ".crawler");
+ defaultMap.put(FessConfig.INDEX_DOCUMENT_CRAWLER_QUEUE_number_of_shards, "10");
+ defaultMap.put(FessConfig.INDEX_DOCUMENT_CRAWLER_DATA_number_of_shards, "10");
+ defaultMap.put(FessConfig.INDEX_DOCUMENT_CRAWLER_FILTER_number_of_shards, "10");
+ defaultMap.put(FessConfig.INDEX_DOCUMENT_CRAWLER_QUEUE_number_of_replicas, "1");
+ defaultMap.put(FessConfig.INDEX_DOCUMENT_CRAWLER_DATA_number_of_replicas, "1");
+ defaultMap.put(FessConfig.INDEX_DOCUMENT_CRAWLER_FILTER_number_of_replicas, "1");
defaultMap.put(FessConfig.INDEX_CONFIG_INDEX, ".fess_config");
defaultMap.put(FessConfig.INDEX_USER_INDEX, ".fess_user");
defaultMap.put(FessConfig.INDEX_LOG_INDEX, "fess_log");
@@ -8614,6 +8790,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.ONLINE_HELP_NAME_ACCESSTOKEN, "accesstoken");
defaultMap.put(FessConfig.ONLINE_HELP_NAME_SUGGEST, "suggest");
defaultMap.put(FessConfig.ONLINE_HELP_NAME_SEARCHLOG, "searchlog");
+ defaultMap.put(FessConfig.ONLINE_HELP_NAME_MAINTENANCE, "maintenance");
defaultMap.put(FessConfig.ONLINE_HELP_SUPPORTED_LANGS, "ja");
defaultMap.put(FessConfig.SUGGEST_POPULAR_WORD_SEED, "0");
defaultMap.put(FessConfig.SUGGEST_POPULAR_WORD_TAGS, "");
diff --git a/src/main/resources/crawler_es+crawlerConfig.xml b/src/main/resources/crawler_es+crawlerConfig.xml
new file mode 100644
index 000000000..5336b89eb
--- /dev/null
+++ b/src/main/resources/crawler_es+crawlerConfig.xml
@@ -0,0 +1,16 @@
+
+
+