summaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12398 from vespa-engine/mpolden/combined-idJon Marius Venstad2020-03-033-29/+59
|\
| * Add combined ID to ClusterSpecMartin Polden2020-03-023-29/+59
* | Revert "Bratseth/phrase segmenting feature flag"Arnstein Ressem2020-03-033-18/+4
* | Merge pull request #12399 from vespa-engine/bratseth/phrase-segmenting-featur...Jon Bratseth2020-03-023-4/+18
|\ \
| * | Add phrase-segmenting flagJon Bratseth2020-03-023-4/+18
| |/
* | Merge pull request #12392 from vespa-engine/gjoranv/prohibit-cloudwatch-for-h...gjoranv2020-03-023-0/+139
|\ \ | |/ |/|
| * Add validator for 'cloudwatch' in services.xmlgjoranv2020-03-023-0/+139
* | Export distributor GC documents_removed metricTor Brede Vekterli2020-02-281-0/+2
|/
* Add handling of optional 'file' attribute to 'shared-credentials'gjoranv2020-02-273-10/+25
* Modify xml syntax for cloudwatchgjoranv2020-02-275-24/+37
* Add flag that tells if this is hosted Vespa.gjoranv2020-02-271-0/+2
* Revert "Merge pull request #12351 from vespa-engine/revert-11875-bratseth/nod...Jon Bratseth2020-02-264-18/+12
* Revert "Bratseth/node metrics"Harald Musum2020-02-264-12/+18
* Merge pull request #12346 from vespa-engine/gjoranv/add-telegraf-componentgjoranv2020-02-263-11/+72
|\
| * Add Telegraf components to metrics-proxy clustersgjoranv2020-02-263-11/+72
* | Merge branch 'master' into bratseth/node-metricsJon Bratseth2020-02-2522-272/+554
|\|
| * Allow all legal chars for cloudwatch namespacegjoranv2020-02-252-2/+2
| * Export list of whitelisted handlers from AccessControlBjørn Christian Seime2020-02-251-2/+1
| * Revert "Revert "Control -XX:CompressedClassSpaceSize jvm option.""Henning Baldersheim2020-02-206-12/+21
| * Revert "Add Telegraf components to metrics-proxy clusters."gjoranv2020-02-202-37/+10
| * Merge pull request #12288 from vespa-engine/gjoranv/add-telegraf-componentsgjoranv2020-02-205-251/+299
| |\
| | * Simplfy: use the most convenient getConfig() method.gjoranv2020-02-201-7/+7
| | * Extract tests related to metrics consumers to a new class.gjoranv2020-02-203-235/+255
| | * Add Telegraf components to metrics-proxy clusters.gjoranv2020-02-202-10/+37
| * | Merge pull request #12287 from vespa-engine/geirst/integrate-nearest-neighbor...Geir Storli2020-02-201-8/+10
| |\ \
| | * | Don't deactivate processing of index settings when validation is turned off.Geir Storli2020-02-201-8/+10
| * | | Revert "Control -XX:CompressedClassSpaceSize jvm option."Bjørn Christian Seime2020-02-206-21/+12
| | |/ | |/|
| * | Put back CMS as it was actually used.Henning Baldersheim2020-02-201-0/+1
| * | Control -XX:CompressedClassSpaceSize jvm option.Henning Baldersheim2020-02-206-13/+21
| * | Merge pull request #12199 from vespa-engine/olaa/telegraf-componentgjoranv2020-02-201-0/+4
| |\ \
| | * | Exclude velocity artifact in config-model/pom.xmlOla Aunrønning2020-02-201-0/+4
| * | | Reduce max heap from 512m to 384mHenning Baldersheim2020-02-201-0/+9
| |/ /
| * | Merge pull request #12264 from vespa-engine/andreer/more-informative-certific...Andreas Eriksen2020-02-202-2/+2
| |\ \
| | * | include app name in CERTIFICATE_NOT_READY messageandreer2020-02-192-2/+2
| * | | Merge pull request #12261 from vespa-engine/gjoranv/cloudwatch-consumer-syntaxgjoranv2020-02-209-8/+246
| |\ \ \
| | * | | Propagate cloudwatch setup to telegraf config.gjoranv2020-02-197-4/+216
| | * | | Add xml schema for 'cloudwatch' element.gjoranv2020-02-182-4/+30
| * | | | Merge pull request #12231 from vespa-engine/bjorncs/vespa-security-env-hostna...Bjørn Christian Seime2020-02-201-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | The '--insecure' flag is added implicitly by vespa-curl-wrapperBjørn Christian Seime2020-02-171-1/+1
| | |/ /
* | | | Fetch metrics from a containerJon Bratseth2020-02-251-2/+3
* | | | Use correct metric output namesJon Bratseth2020-02-241-0/+1
* | | | Merge branch 'master' into bratseth/node-metricsJon Bratseth2020-02-20145-808/+3163
|\| | |
| * | | Component id must be globally unique. Not enough to be unique in the branch.Henning Baldersheim2020-02-194-16/+17
| * | | Revert "Revert "Revert "Revert "Create a resourcepool so that we do not need ...Henning Baldersheim2020-02-195-22/+60
| * | | Revert "Revert "Revert "Create a resourcepool so that we do not need to recon...Harald Musum2020-02-195-60/+22
| * | | Merge pull request #12202 from vespa-engine/revert-12197-revert-12184-balder/...Henning Baldersheim2020-02-185-22/+60
| |\ \ \ | | |_|/ | |/| |
| | * | Use class.getName to get compile time error detection.Henning Baldersheim2020-02-173-4/+4
| | * | Make the resourcepool a proper child of the dispatcher.Henning Baldersheim2020-02-153-13/+25
| | * | Let rpcresourcepool be a child of dispatcher and inject it.Henning Baldersheim2020-02-144-26/+16
| | * | Revert "Revert "Create a resourcepool so that we do not need to reconnect to ...Henning Baldersheim2020-02-143-18/+54