summaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Expand)AuthorAgeFilesLines
* Make sure that 'system' yinst setting is propagated to configserver configHarald Musum2016-11-143-2/+8
* I assume the intention was to first run clean, then make all.Henning Baldersheim2016-11-111-1/+1
* Nonfunctional changes onlyJon Bratseth2016-11-111-6/+3
* Ignore case for metric consumer ids.gjoranv2016-11-113-4/+14
* Merge pull request #1058 from yahoo/bratseth/field-operation-ordergjoranv2016-11-1014-54/+137
|\
| * Order field operationsJon Bratseth2016-11-1014-54/+137
* | Merge pull request #1051 from yahoo/balder/let-0.2-be-the-default-setting-for...Håvard Pettersen2016-11-102-7/+7
|\ \
| * | Update default valueHenning Baldersheim2016-11-091-6/+6
| * | Let 0.2 be the default value for maxFilterCoverageHenning Baldersheim2016-11-091-1/+1
* | | Allow and test new 'metrics' element in services.xml.gjoranv2016-11-104-6/+24
| |/ |/|
* | Merge pull request #1046 from yahoo/gjoranv/yamas-vespa-consumer-idgjoranv2016-11-105-40/+44
|\ \ | |/ |/|
| * There is only one default metrics consumer.gjoranv2016-11-091-13/+2
| * Rename DefaultMetricConsumers -> DefaultMetricsConsumergjoranv2016-11-094-7/+4
| * Make 'vespa' the default metrics consumer, instead of 'yamas'.gjoranv2016-11-094-11/+29
* | add totalhits_per_query metricArne H Juul2016-11-091-1/+2
|/
* Merge pull request #1026 from yahoo/gjoranv/metrics-buildergjoranv2016-11-0810-12/+143
|\
| * Wire the new MetricsBuilder into Admin.gjoranv2016-11-074-9/+25
| * Add builder for new 'metrics' element in services.xmlgjoranv2016-11-073-0/+111
| * Annotate data classes as Immutablegjoranv2016-11-073-3/+7
* | Add accesslog type 'json' to schemaHarald Musum2016-11-084-6/+8
|/
* Add MetricSet abstraction and a VespaMetricSet.gjoranv2016-11-068-310/+510
* Make the Metric class immutable. (#1021)gjoranv2016-11-044-37/+36
* Use preprocessed application package to check for nodes with type specHarald Musum2016-11-031-1/+1
* Create a separate 'monitoring' package for metrics w/friends. (#995)gjoranv2016-11-0216-18/+26
* Remove dead httpgateway codeJon Bratseth2016-11-013-59/+3
* Test json log configuringJon Bratseth2016-10-301-10/+27
* First stab at JSON access log [VESPA-5228]Frode Lundgren2016-10-292-1/+7
* Remove comment in macro shadowing test caseLester Solbakken2016-10-261-4/+0
* Add macro shadowingLester Solbakken2016-10-263-0/+267
* Merge pull request #931 from yahoo/loffevoff/tensor-type-change-validationVegard Sjonfjell2016-10-253-6/+63
|\
| * Rewrite commentVegard Sjonfjell2016-10-251-1/+2
| * Whitespace fixesVegard Sjonfjell2016-10-211-4/+0
| * Implement tensor type change validation (requires refeed)Vegard Sjonfjell2016-10-213-6/+66
* | Rename methods, forgotten in previous commit. (#948)gjoranv2016-10-251-12/+12
* | Remove the 'ymon' consumer and extract methods for readability. (#944)gjoranv2016-10-251-160/+179
* | Fix such that we can override only one of proton resource limits.Geir Storli2016-10-242-6/+27
* | Merge pull request #908 from yahoo/bratseth/document-api-in-container-devJon Bratseth2016-10-211-4/+5
|\ \
| * | Nonfunctional changes onlyJon Bratseth2016-10-191-2/+3
| * | Nonfunctional changes onlyJon Bratseth2016-10-191-2/+2
* | | Honor aliases element only in prod (#915)Harald Musum2016-10-203-9/+36
|/ /
* | owner -> owningClusterJon Bratseth2016-10-171-4/+4
* | Remove unused importJon Bratseth2016-10-171-1/+0
* | Don't ask about combined clusters too earlyJon Bratseth2016-10-172-6/+41
* | Nonfunctional changesJon Bratseth2016-10-171-1/+1
* | Merge with masterJon Bratseth2016-10-1721-7/+300
|\ \
| * | Revert rename of public HostName.getLocalhostHåkon Hallingstad2016-10-148-17/+17
| * | Revert "Revert "Use HostName for message bus, but fix HostName to work with d...hakonhall2016-10-148-23/+17
| * | Revert "Use HostName for message bus, but fix HostName to work with dev machi...Eirik Nygaard2016-10-148-17/+23
| * | Rename getLocalhost to getHostNameHåkon Hallingstad2016-10-138-22/+17
| * | Fall back to picking another resolvable and reachable address if the systemHåkon Hallingstad2016-10-131-1/+0