diff --git a/src/main/java/org/phoebus/channelfinder/service/MetricsService.java b/src/main/java/org/phoebus/channelfinder/service/MetricsService.java index e07ec11..0fd6744 100644 --- a/src/main/java/org/phoebus/channelfinder/service/MetricsService.java +++ b/src/main/java/org/phoebus/channelfinder/service/MetricsService.java @@ -12,22 +12,20 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; +import java.util.logging.Logger; import java.util.stream.Collectors; import org.phoebus.channelfinder.repository.ChannelRepository; import org.phoebus.channelfinder.repository.PropertyRepository; import org.phoebus.channelfinder.repository.TagRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.PropertySource; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @Service -@PropertySource(value = "classpath:application.properties") public class MetricsService { - public static final String CF_TOTAL_CHANNEL_COUNT = "cf.total.channel.count"; public static final String CF_PROPERTY_COUNT = "cf.property.count"; public static final String CF_TAG_COUNT = "cf.tag.count"; @@ -60,7 +58,7 @@ public class MetricsService { Map> parseProperties() { if (metricProperties == null || metricProperties.isEmpty()) { - return new LinkedMultiValueMap<>(); + return Map.of(); } return Arrays.stream(metricProperties.split(";")) .map( @@ -121,9 +119,7 @@ public static List> generateAllMultiValueMaps( List> allMultiValueMaps = new ArrayList<>(); if (properties.isEmpty()) { - allMultiValueMaps.add( - new LinkedMultiValueMap<>()); // Add an empty map for the case where all are null - return allMultiValueMaps; + return List.of(); } List>> entries = new ArrayList<>(properties.entrySet()); @@ -211,7 +207,11 @@ private void updatePropertyMetrics() { @Scheduled(fixedRateString = "${metrics.updateInterval}", timeUnit = TimeUnit.SECONDS) public void updateMetrics() { - updateTagMetrics(); - updatePropertyMetrics(); + if (tagMetrics != null && !tagMetrics.isEmpty()) { + updateTagMetrics(); + } + if (propertyMetrics != null && !propertyMetrics.isEmpty()) { + updatePropertyMetrics(); + } } } diff --git a/src/test/java/org/phoebus/channelfinder/AuthorizationIT.java b/src/test/java/org/phoebus/channelfinder/AuthorizationIT.java index 4215691..e43ae8f 100644 --- a/src/test/java/org/phoebus/channelfinder/AuthorizationIT.java +++ b/src/test/java/org/phoebus/channelfinder/AuthorizationIT.java @@ -11,10 +11,12 @@ import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; @WebMvcTest(AuthorizationService.class) @TestPropertySource(value = "classpath:application_test.properties") +@ContextConfiguration(classes = {AuthorizationService.class}) class AuthorizationIT { @Autowired AuthorizationService authorizationService; diff --git a/src/test/java/org/phoebus/channelfinder/ChannelControllerIT.java b/src/test/java/org/phoebus/channelfinder/ChannelControllerIT.java index 2726265..ad2b338 100644 --- a/src/test/java/org/phoebus/channelfinder/ChannelControllerIT.java +++ b/src/test/java/org/phoebus/channelfinder/ChannelControllerIT.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.web.server.ResponseStatusException; @@ -32,6 +33,8 @@ @WebMvcTest(ChannelController.class) @WithMockUser(roles = "CF-ADMINS") @TestPropertySource(value = "classpath:application_test.properties") +@ContextConfiguration( + classes = {ChannelController.class, ElasticConfig.class, ChannelRepository.class}) class ChannelControllerIT { @Autowired IChannel channelManager; diff --git a/src/test/java/org/phoebus/channelfinder/ChannelRepositoryIT.java b/src/test/java/org/phoebus/channelfinder/ChannelRepositoryIT.java index 2225cbc..de1d23c 100644 --- a/src/test/java/org/phoebus/channelfinder/ChannelRepositoryIT.java +++ b/src/test/java/org/phoebus/channelfinder/ChannelRepositoryIT.java @@ -25,6 +25,7 @@ import org.phoebus.channelfinder.repository.TagRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -33,6 +34,7 @@ @TestInstance(TestInstance.Lifecycle.PER_CLASS) @WebMvcTest(ChannelRepository.class) @TestPropertySource(value = "classpath:application_test.properties") +@ContextConfiguration(classes = {ChannelRepository.class, ElasticConfig.class}) class ChannelRepositoryIT { @Autowired ElasticConfig esService; diff --git a/src/test/java/org/phoebus/channelfinder/ChannelRepositorySearchIT.java b/src/test/java/org/phoebus/channelfinder/ChannelRepositorySearchIT.java index db0591b..66e041b 100644 --- a/src/test/java/org/phoebus/channelfinder/ChannelRepositorySearchIT.java +++ b/src/test/java/org/phoebus/channelfinder/ChannelRepositorySearchIT.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -32,6 +33,7 @@ @TestInstance(TestInstance.Lifecycle.PER_CLASS) @WebMvcTest(ChannelRepository.class) @TestPropertySource(locations = "classpath:application_test.properties") +@ContextConfiguration(classes = {ChannelRepository.class, ElasticConfig.class}) class ChannelRepositorySearchIT { private static final Logger logger = Logger.getLogger(ChannelRepositorySearchIT.class.getName()); diff --git a/src/test/java/org/phoebus/channelfinder/ChannelScrollControllerIT.java b/src/test/java/org/phoebus/channelfinder/ChannelScrollControllerIT.java index d3404f7..dafbbb0 100644 --- a/src/test/java/org/phoebus/channelfinder/ChannelScrollControllerIT.java +++ b/src/test/java/org/phoebus/channelfinder/ChannelScrollControllerIT.java @@ -16,6 +16,7 @@ import org.phoebus.channelfinder.rest.controller.ChannelScrollController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -23,6 +24,7 @@ @TestInstance(TestInstance.Lifecycle.PER_CLASS) @WebMvcTest(ChannelScrollController.class) @TestPropertySource(value = "classpath:application_test.properties") +@ContextConfiguration(classes = {ChannelScrollController.class, ElasticConfig.class}) class ChannelScrollControllerIT { @Autowired IChannelScroll channelScroll; diff --git a/src/test/java/org/phoebus/channelfinder/ChannelScrollControllerSearchIT.java b/src/test/java/org/phoebus/channelfinder/ChannelScrollControllerSearchIT.java index 24907f6..6cb7dad 100644 --- a/src/test/java/org/phoebus/channelfinder/ChannelScrollControllerSearchIT.java +++ b/src/test/java/org/phoebus/channelfinder/ChannelScrollControllerSearchIT.java @@ -18,6 +18,7 @@ import org.phoebus.channelfinder.rest.controller.ChannelScrollController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -25,6 +26,7 @@ @TestInstance(TestInstance.Lifecycle.PER_CLASS) @WebMvcTest(ChannelScrollController.class) @TestPropertySource(value = "classpath:application_test.properties") +@ContextConfiguration(classes = {ChannelScrollController.class, ElasticConfig.class}) class ChannelScrollControllerSearchIT { private static final Logger logger = diff --git a/src/test/java/org/phoebus/channelfinder/ChannelValidationIT.java b/src/test/java/org/phoebus/channelfinder/ChannelValidationIT.java index dc992dd..b15e096 100644 --- a/src/test/java/org/phoebus/channelfinder/ChannelValidationIT.java +++ b/src/test/java/org/phoebus/channelfinder/ChannelValidationIT.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.web.server.ResponseStatusException; @@ -29,6 +30,7 @@ @WebMvcTest(ChannelController.class) @WithMockUser(roles = "CF-ADMINS") @TestPropertySource(value = "classpath:application_test.properties") +@ContextConfiguration(classes = {ChannelController.class, ElasticConfig.class}) class ChannelValidationIT { @Autowired IChannel channelManager; diff --git a/src/test/java/org/phoebus/channelfinder/MetricsServiceIT.java b/src/test/java/org/phoebus/channelfinder/MetricsServiceIT.java index 4800931..f853347 100644 --- a/src/test/java/org/phoebus/channelfinder/MetricsServiceIT.java +++ b/src/test/java/org/phoebus/channelfinder/MetricsServiceIT.java @@ -25,6 +25,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.web.servlet.MockMvc; import org.springframework.util.LinkedMultiValueMap; @@ -41,6 +42,7 @@ "metrics.properties=testProperty0: value0, value1; testProperty1: value0, !*", "metrics.updateInterval=1" }) +@ContextConfiguration(classes = {ElasticConfig.class, MetricsService.class}) class MetricsServiceIT { public static final String METRICS_ENDPOINT = "/actuator/metrics"; @@ -69,11 +71,6 @@ void setupAll() { ElasticConfigIT.setUp(esService); } - @AfterAll - void tearDown() throws IOException { - ElasticConfigIT.teardown(esService); - } - @AfterEach public void cleanup() { MultiValueMap map = new LinkedMultiValueMap<>(); diff --git a/src/test/java/org/phoebus/channelfinder/MetricsServiceTest.java b/src/test/java/org/phoebus/channelfinder/MetricsServiceTest.java index 8bd0841..1bd55db 100644 --- a/src/test/java/org/phoebus/channelfinder/MetricsServiceTest.java +++ b/src/test/java/org/phoebus/channelfinder/MetricsServiceTest.java @@ -67,7 +67,7 @@ void testGenerateAllMultiValueMaps_emptyMap() { List> allMaps = MetricsService.generateAllMultiValueMaps(properties); - assertEquals(1, allMaps.size()); + assertEquals(0, allMaps.size()); } // Helper method to create a MultiValueMap for easier assertion diff --git a/src/test/java/org/phoebus/channelfinder/PropertyControllerIT.java b/src/test/java/org/phoebus/channelfinder/PropertyControllerIT.java index 0923c1c..26972c3 100644 --- a/src/test/java/org/phoebus/channelfinder/PropertyControllerIT.java +++ b/src/test/java/org/phoebus/channelfinder/PropertyControllerIT.java @@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -35,6 +36,7 @@ @WebMvcTest(PropertyController.class) // TODO Somehow creating one @WithMockUser(roles = "CF-ADMINS") @TestPropertySource(value = "classpath:application_test.properties") +@ContextConfiguration(classes = {PropertyController.class, ElasticConfig.class}) class PropertyControllerIT { @Autowired IProperty propertyManager; diff --git a/src/test/java/org/phoebus/channelfinder/PropertyRepositoryIT.java b/src/test/java/org/phoebus/channelfinder/PropertyRepositoryIT.java index 83ff891..85452d0 100644 --- a/src/test/java/org/phoebus/channelfinder/PropertyRepositoryIT.java +++ b/src/test/java/org/phoebus/channelfinder/PropertyRepositoryIT.java @@ -21,6 +21,7 @@ import org.phoebus.channelfinder.repository.PropertyRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -29,6 +30,7 @@ @TestInstance(TestInstance.Lifecycle.PER_CLASS) @WebMvcTest(PropertyRepository.class) @TestPropertySource(value = "classpath:application_test.properties") +@ContextConfiguration(classes = {PropertyRepository.class, ElasticConfig.class}) class PropertyRepositoryIT { public static final String TEST_PROPERTY_NAME = "testProperty"; diff --git a/src/test/java/org/phoebus/channelfinder/PropertyValidationIT.java b/src/test/java/org/phoebus/channelfinder/PropertyValidationIT.java index 530248a..f86ac3e 100644 --- a/src/test/java/org/phoebus/channelfinder/PropertyValidationIT.java +++ b/src/test/java/org/phoebus/channelfinder/PropertyValidationIT.java @@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.web.server.ResponseStatusException; @@ -26,6 +27,7 @@ @WebMvcTest(PropertyController.class) @WithMockUser(roles = "CF-ADMINS") @TestPropertySource(value = "classpath:application_test.properties") +@ContextConfiguration(classes = {PropertyController.class, ElasticConfig.class}) class PropertyValidationIT { @Autowired IProperty propertyManager; diff --git a/src/test/java/org/phoebus/channelfinder/TagRepositoryIT.java b/src/test/java/org/phoebus/channelfinder/TagRepositoryIT.java index df0e9d4..cf40407 100644 --- a/src/test/java/org/phoebus/channelfinder/TagRepositoryIT.java +++ b/src/test/java/org/phoebus/channelfinder/TagRepositoryIT.java @@ -19,6 +19,7 @@ import org.phoebus.channelfinder.repository.TagRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -27,6 +28,7 @@ @TestInstance(TestInstance.Lifecycle.PER_CLASS) @WebMvcTest(TagRepository.class) @TestPropertySource(value = "classpath:application_test.properties") +@ContextConfiguration(classes = {TagRepository.class, ElasticConfig.class}) class TagRepositoryIT { @Autowired ElasticConfig esService; diff --git a/src/test/java/org/phoebus/channelfinder/TagValidationIT.java b/src/test/java/org/phoebus/channelfinder/TagValidationIT.java index 77a9b33..4baecdf 100644 --- a/src/test/java/org/phoebus/channelfinder/TagValidationIT.java +++ b/src/test/java/org/phoebus/channelfinder/TagValidationIT.java @@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.web.server.ResponseStatusException; @@ -25,6 +26,7 @@ @WebMvcTest(TagController.class) @WithMockUser(roles = "CF-ADMINS") @TestPropertySource(value = "classpath:application_test.properties") +@ContextConfiguration(classes = {TagController.class, ElasticConfig.class}) class TagValidationIT { @Autowired ITag tagManager; diff --git a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorIT.java b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorIT.java index 665f14c..afb48dc 100644 --- a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorIT.java +++ b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorIT.java @@ -28,7 +28,7 @@ import org.springframework.test.context.TestPropertySource; @WebMvcTest(AAChannelProcessor.class) -@TestPropertySource(value = "classpath:application_test.properties") +@TestPropertySource(value = "classpath:application_aa_proc_test.properties") class AAChannelProcessorIT { protected static Property archiveProperty = new Property("archive", "owner", "default"); diff --git a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorMultiIT.java b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorMultiIT.java index 593b2b0..1122d86 100644 --- a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorMultiIT.java +++ b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorMultiIT.java @@ -32,7 +32,7 @@ import org.springframework.test.context.TestPropertySource; @WebMvcTest(AAChannelProcessor.class) -@TestPropertySource(value = "classpath:application_test.properties") +@TestPropertySource(value = "classpath:application_aa_proc_test.properties") class AAChannelProcessorMultiIT { public static final String BEING_ARCHIVED = "Being archived"; diff --git a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorNoDefaultIT.java b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorNoDefaultIT.java index 8ed2eb0..74cdf96 100644 --- a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorNoDefaultIT.java +++ b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorNoDefaultIT.java @@ -24,7 +24,7 @@ @WebMvcTest(AAChannelProcessor.class) @TestPropertySource( - locations = "classpath:application_test.properties", + locations = "classpath:application_aa_proc_test.properties", properties = "aa.urls:{'default': '','aa': 'http://localhost:17665'}") class AAChannelProcessorNoDefaultIT { protected static Property archiverProperty = new Property("archiver", "owner", "aa"); diff --git a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorNoPauseIT.java b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorNoPauseIT.java index aeb0457..58d9cb2 100644 --- a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorNoPauseIT.java +++ b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorNoPauseIT.java @@ -23,7 +23,7 @@ @WebMvcTest(AAChannelProcessor.class) @TestPropertySource( - locations = "classpath:application_test.properties", + locations = "classpath:application_aa_proc_test.properties", properties = "aa.auto_pause=none") class AAChannelProcessorNoPauseIT { diff --git a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorStatusPauseIT.java b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorStatusPauseIT.java index 5b8fdbb..a7171e9 100644 --- a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorStatusPauseIT.java +++ b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorStatusPauseIT.java @@ -23,7 +23,7 @@ @WebMvcTest(AAChannelProcessor.class) @TestPropertySource( - locations = "classpath:application_test.properties", + locations = "classpath:application_aa_proc_test.properties", properties = "aa.auto_pause=pvStatus") class AAChannelProcessorStatusPauseIT { diff --git a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorTagPauseIT.java b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorTagPauseIT.java index b6b9a83..bcb3ced 100644 --- a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorTagPauseIT.java +++ b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorTagPauseIT.java @@ -23,7 +23,7 @@ @WebMvcTest(AAChannelProcessor.class) @TestPropertySource( - locations = "classpath:application_test.properties", + locations = "classpath:application_aa_proc_test.properties", properties = "aa.auto_pause=archive") class AAChannelProcessorTagPauseIT { diff --git a/src/test/resources/application_aa_proc_test.properties b/src/test/resources/application_aa_proc_test.properties new file mode 100644 index 0000000..28a13c7 --- /dev/null +++ b/src/test/resources/application_aa_proc_test.properties @@ -0,0 +1,38 @@ + +logging.level.org.springframework.web=INFO + +############################## Service Info ############################### +# ChannelFinder version as defined in the pom file +channelfinder.version=@project.version@ + +############################## REST Logging ############################### +# DEBUG level will log all requests and responses to and from the REST end points +logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=INFO + +################ Processor ################################################## +processors.chunking.size=10000 + +################ Archiver Appliance Configuration Processor ################# +aa.urls={'default': 'http://localhost:17665'} +aa.default_alias=default +aa.enabled=true +aa.pva=false +aa.archive_property_name=archive +aa.archiver_property_name=archiver + +# Set the auto pause behaviour +# +# Empty for no auto pause +# Or pvStatus to pause on pvStatus=Inactive +# Or match archive_property_name to pause on archive_property_name not existing +# Or both, i.e. aa.auto_pause=pvStatus,archive +# +aa.auto_pause=pvStatus,archive + + +############################## Metrics ############################### +#actuator +management.endpoints.web.exposure.include=prometheus, metrics, health, info +metrics.tags= +metrics.properties= +metrics.updateInterval=1 \ No newline at end of file diff --git a/src/test/resources/application_test.properties b/src/test/resources/application_test.properties index e6dfaca..ec31e9b 100644 --- a/src/test/resources/application_test.properties +++ b/src/test/resources/application_test.properties @@ -89,22 +89,7 @@ logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=INFO processors.chunking.size=10000 ################ Archiver Appliance Configuration Processor ################# -aa.urls={'default': 'http://localhost:17665'} -aa.default_alias=default -aa.enabled=true -aa.pva=false -aa.archive_property_name=archive -aa.archiver_property_name=archiver - -# Set the auto pause behaviour -# -# Empty for no auto pause -# Or pvStatus to pause on pvStatus=Inactive -# Or match archive_property_name to pause on archive_property_name not existing -# Or both, i.e. aa.auto_pause=pvStatus,archive -# -aa.auto_pause=pvStatus,archive - +aa.enabled=false ############################## Metrics ############################### #actuator diff --git a/src/test/resources/application_test_multi.properties b/src/test/resources/application_test_multi.properties index b16b423..91c2ed0 100644 --- a/src/test/resources/application_test_multi.properties +++ b/src/test/resources/application_test_multi.properties @@ -87,6 +87,7 @@ logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=INFO ################ Archiver Appliance Configuration Processor ################# aa.urls={'post': 'http://localhost:17664', 'query': 'http://localhost:17665'} +aa.enabled=true aa.default_alias=post, query aa.pva=false aa.archive_property_name=archive