Merge branch 'yaccz/curl-status'
authorFlorian Forster <octo@collectd.org>
Sun, 26 May 2013 15:35:17 +0000 (17:35 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 26 May 2013 15:35:17 +0000 (17:35 +0200)
1  2 
src/types.db

diff --combined src/types.db
@@@ -6,7 -6,6 +6,7 @@@ apache_requests          value:DERIVE:0:
  apache_scoreboard     value:GAUGE:0:65535
  ath_nodes             value:GAUGE:0:65535
  ath_stat              value:DERIVE:0:U
 +backends              value:GAUGE:0:65535
  bitrate                       value:GAUGE:0:4294967295
  bytes                 value:GAUGE:0:U
  cache_eviction                value:DERIVE:0:U
@@@ -111,7 -110,6 +111,7 @@@ node_octets                rx:DERIVE:0:U, tx:DERIVE:0
  node_rssi             value:GAUGE:0:255
  node_stat             value:DERIVE:0:U
  node_tx_rate          value:GAUGE:0:127
 +objects                       value:GAUGE:0:U
  operations            value:DERIVE:0:U
  percent                       value:GAUGE:0:100.1
  pf_counters           value:DERIVE:0:U
@@@ -147,6 -145,7 +147,7 @@@ queue_length               value:GAUGE:0:
  records                       value:GAUGE:0:U
  requests              value:GAUGE:0:U
  response_time         value:GAUGE:0:U
+ response_code         value:GAUGE:0:U
  route_etx             value:GAUGE:0:U
  route_metric          value:GAUGE:0:U
  routes                        value:GAUGE:0:U
@@@ -167,7 -166,6 +168,7 @@@ timeleft           value:GAUGE:0:
  time_offset           value:GAUGE:-1000000:1000000
  total_bytes           value:DERIVE:0:U
  total_connections     value:DERIVE:0:U
 +total_objects         value:DERIVE:0:U
  total_operations      value:DERIVE:0:U
  total_requests                value:DERIVE:0:U
  total_sessions                value:DERIVE:0:U
@@@ -176,7 -174,6 +177,7 @@@ total_time_in_ms   value:DERIVE:0:
  total_values          value:DERIVE:0:U
  uptime                        value:GAUGE:0:4294967295
  users                 value:GAUGE:0:65535
 +vcl                   value:GAUGE:0:65535
  vcpu                  value:GAUGE:0:U
  virt_cpu_total                value:DERIVE:0:U
  virt_vcpu             value:DERIVE:0:U
@@@ -190,7 -187,6 +191,7 @@@ voltage                    value:GAUGE:U:
  vs_memory             value:GAUGE:0:9223372036854775807
  vs_processes          value:GAUGE:0:65535
  vs_threads            value:GAUGE:0:65535
 +
  #
  # Legacy types
  # (required for the v5 upgrade target)