diff options
12 files changed, 35 insertions, 40 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java index f0b0d7e67b1..6c665affd1e 100644 --- a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java +++ b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java @@ -435,7 +435,7 @@ public abstract class AbstractConfigProducer<CHILD extends AbstractConfigProduce } // TODO: Make producers depend on AdminModel instead - /** Returns a monitoring service (yamas if that is configured, null otherwise) */ + /** Returns a monitoring service if configured, null otherwise */ protected Monitoring getMonitoringService() { AbstractConfigProducerRoot root = getRoot(); Admin admin = (root == null? null : root.getAdmin()); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/Service.java b/config-model/src/main/java/com/yahoo/vespa/model/Service.java index 7c879c946ed..620e44bc11a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/Service.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/Service.java @@ -6,7 +6,6 @@ import com.yahoo.config.model.api.ServiceInfo; import java.util.HashMap; import java.util.Optional; - /** * Representation of a process which runs a service * @@ -20,7 +19,7 @@ public interface Service extends ConfigProducer { * configuration. * TODO: Should change this to Optional of String */ - public String getStartupCommand(); + String getStartupCommand(); /** * Services that wish that a command should be run before shutdown @@ -28,32 +27,32 @@ public interface Service extends ConfigProducer { * by the config sentinel before sending SIGTERM to the service. * The command is executed without a timeout. */ - public Optional<String> getPreShutdownCommand(); + Optional<String> getPreShutdownCommand(); /** * Tells if this service should be autostarted by * config-sentinel. Returned value will be used to configure the * config-sentinel. */ - public boolean getAutostartFlag(); + boolean getAutostartFlag(); /** * Tells if this service should be autorestarted by * config-sentinel. Returned value will be used to configure the * config-sentinel. */ - public boolean getAutorestartFlag(); + boolean getAutorestartFlag(); /** * Returns the type of service. E.g. the class-name without the * package prefix. */ - public String getServiceType(); + String getServiceType(); /** * Returns the name that identifies this service for the config-sentinel. */ - public String getServiceName(); + String getServiceName(); /** * Returns the desired base port for this service, or '0' if this @@ -61,7 +60,7 @@ public interface Service extends ConfigProducer { * * @return The desired base port for this service. */ - public int getWantedPort(); + int getWantedPort(); /** * Returns true if the desired base port (returned by @@ -70,37 +69,37 @@ public interface Service extends ConfigProducer { * * @return true if this Service requires the wanted base port. */ - public boolean requiresWantedPort(); + boolean requiresWantedPort(); /** * Returns the number of ports needed by this service. */ - public int getPortCount(); + int getPortCount(); /** * Returns a PortsMeta object, giving access to more information * about the different ports of this service. */ - public PortsMeta getPortsMeta(); + PortsMeta getPortsMeta(); /** * @return the physical host on which this service runs. */ - public Host getHost(); + Host getHost(); /** * Get meta information about service. * @return an instance of {@link com.yahoo.config.model.api.ServiceInfo} */ - public ServiceInfo getServiceInfo(); + ServiceInfo getServiceInfo(); /** * @return The hostname on which this service runs. */ - public String getHostName(); + String getHostName(); /** Optional JVM execution args for this service */ - public String getJvmArgs(); + String getJvmArgs(); /** * Computes and returns the i'th port for this service, based on @@ -110,7 +109,7 @@ public interface Service extends ConfigProducer { * @return the i'th port relative to the base port. * @throws IllegalStateException if i is out of range. */ - public int getRelativePort(int i); + int getRelativePort(int i); /** * Gets a service property value mapped to the given key @@ -120,23 +119,21 @@ public interface Service extends ConfigProducer { * @param defStr default String value returned if no value for key found * @return the associated String value for the given key, or */ - public String getServicePropertyString(String key, String defStr); + String getServicePropertyString(String key, String defStr); - /** - * @return the service health port, to report status to yamas - */ - public int getHealthPort(); + int getHealthPort(); /** * * @return HashMap of default dimensions for metrics. */ - public HashMap<String,String> getDefaultMetricDimensions(); + HashMap<String,String> getDefaultMetricDimensions(); /** * Return the Affinity of this service if it has. * * @return The {@link com.yahoo.vespa.model.Affinity} for this service. */ - public Optional<Affinity> getAffinity(); + Optional<Affinity> getAffinity(); + } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMonitoring.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMonitoring.java index bf7a839aaa9..e53f92822b5 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMonitoring.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMonitoring.java @@ -4,10 +4,9 @@ package com.yahoo.vespa.model.admin.monitoring; import java.util.Objects; /** - * Properties for yamas monitoring service + * Monitoring service properties * * @author hmusum - * @since 5.1.20 */ public class DefaultMonitoring implements Monitoring { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomMetricBuilderHelper.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomMetricBuilderHelper.java index 4718d496c36..4c1fdd3f92c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomMetricBuilderHelper.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomMetricBuilderHelper.java @@ -16,12 +16,11 @@ import java.util.Set; import static com.yahoo.vespa.model.admin.monitoring.DefaultMetricsConsumer.VESPA_CONSUMER_ID; /** - * Helper class for parsing yamasmetric config. + * Helper class for parsing metric config. * * TODO: Remove when 'metric-consumers' under 'admin' is disallowed * - * @author trygve - * @since 5.1 + * @author Trygve Berdal */ public class DomMetricBuilderHelper { diff --git a/config-model/src/test/cfg/admin/metricconfig/services.xml b/config-model/src/test/cfg/admin/metricconfig/services.xml index 1e4c9e6e549..a2a03ca0b08 100644 --- a/config-model/src/test/cfg/admin/metricconfig/services.xml +++ b/config-model/src/test/cfg/admin/metricconfig/services.xml @@ -4,7 +4,7 @@ <admin version="2.0"> <adminserver hostalias="node1"/> <logserver hostalias="node1"/> - <yamas interval="60"/> + <monitoring interval="60"/> <metric-consumers> <consumer name="fooConsumer"> <metric name="some.foo.metric" output-name="someFooMetric"/> diff --git a/config-model/src/test/cfg/search/data/v2/proton-yamas/services.xml b/config-model/src/test/cfg/search/data/v2/proton-yamas/services.xml index ffcef775844..116b7f6e4c5 100644 --- a/config-model/src/test/cfg/search/data/v2/proton-yamas/services.xml +++ b/config-model/src/test/cfg/search/data/v2/proton-yamas/services.xml @@ -4,7 +4,7 @@ <admin version="2.0"> <adminserver hostalias="node1"/> <logserver hostalias="node1"/> - <yamas systemname="news_staging" interval="60"/> + <monitoring systemname="news_staging" interval="60"/> </admin> <container version="1.0"> diff --git a/config-model/src/test/cfg/storage/clustercontroller_advanced/services.xml b/config-model/src/test/cfg/storage/clustercontroller_advanced/services.xml index 2a8c30844dd..7e899ee0578 100644 --- a/config-model/src/test/cfg/storage/clustercontroller_advanced/services.xml +++ b/config-model/src/test/cfg/storage/clustercontroller_advanced/services.xml @@ -5,7 +5,7 @@ <admin version="2.0"> <adminserver hostalias="node0"/> <logserver hostalias="node0"/> - <yamas interval="60"/> + <monitoring interval="60"/> </admin> <content version="1.0"> diff --git a/config-model/src/test/schema-test-files/services-hosted-infrastructure.xml b/config-model/src/test/schema-test-files/services-hosted-infrastructure.xml index 05717669408..3ff6758880b 100644 --- a/config-model/src/test/schema-test-files/services-hosted-infrastructure.xml +++ b/config-model/src/test/schema-test-files/services-hosted-infrastructure.xml @@ -5,7 +5,7 @@ <admin version="4.0"> <slobroks><nodes count="3" flavor="small"/></slobroks> <logservers><nodes count="1" dedicated="true"/></logservers> - <yamas systemname="vespa.routing" interval="60" /> + <monitoring systemname="vespa.routing" interval="60" /> <metric-consumers> <consumer name="yamas"> <metric name="upstreams_generated" /> diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/DimensionMetrics.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/DimensionMetrics.java index 2cccee1e066..6a3a4c72bef 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/DimensionMetrics.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/DimensionMetrics.java @@ -26,9 +26,9 @@ public class DimensionMetrics { Map<String, Object> getMetrics() { final Map<String, Object> routing = new HashMap<>(); - final Map<String, Object> routingYamas = new HashMap<>(); - routing.put("yamas", routingYamas); - routingYamas.put("namespaces", Collections.singletonList("Vespa")); + final Map<String, Object> routingMonitoring = new HashMap<>(); + routing.put("yamas", routingMonitoring); + routingMonitoring.put("namespaces", Collections.singletonList("Vespa")); Map<String, Object> report = new HashMap<>(); report.put("application", application); diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java index 31edf49e80e..3ff39819776 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java @@ -16,7 +16,7 @@ import java.util.stream.Collectors; /** * Export metrics to both /state/v1/metrics and makes them available programmatically. - * Each metric belongs to a yamas application + * Each metric belongs to a monitoring application * * @author freva */ @@ -108,7 +108,7 @@ public class MetricReceiverWrapper { return applicationMetrics.get(application).metricsByDimensions(); } - // Application is yamas application, not Vespa application + // "Application" is the monitoring application, not Vespa application private static class ApplicationMetrics { private final Map<Dimensions, Map<String, MetricValue>> metricsByDimensions = new LinkedHashMap<>(); diff --git a/metrics/src/vespa/metrics/metricset.h b/metrics/src/vespa/metrics/metricset.h index 519ea71d67f..5851cdea43c 100644 --- a/metrics/src/vespa/metrics/metricset.h +++ b/metrics/src/vespa/metrics/metricset.h @@ -22,7 +22,7 @@ class MetricSet : public Metric bool _registrationAltered; // Set to true if metrics have been // registered/unregistered since last time // it was reset - std::string _dimensionKey; // If this metric is part of a dimension (yamas-speak), + std::string _dimensionKey; // If this metric is part of a monitoring dimension, // the key of the dimension should be set here. // If so, the name of the metric is used as dimension value. diff --git a/searchcore/src/vespa/searchcore/config/fdispatchrc.def b/searchcore/src/vespa/searchcore/config/fdispatchrc.def index cce62263125..e00e35c43a0 100644 --- a/searchcore/src/vespa/searchcore/config/fdispatchrc.def +++ b/searchcore/src/vespa/searchcore/config/fdispatchrc.def @@ -33,7 +33,7 @@ defaultslowquerylimitfactor double default=2.0 restart ## If 0, fdispatch will not offer RPC service. frtport int default=0 restart -## Port to use for yamas health reporting +## Port for health reporting healthport int default=0 restart ## The maximum time between successful reads on a socket before timeout. |