a3f83afe4a
Move capacity check for stackdriver output plugin ( #5479 )
2019-02-26 17:40:21 -08:00
85617887c4
Add option to disable timestamp adjustment in grok parser ( #5488 )
2019-02-26 17:35:57 -08:00
9740e956ca
Log permission error and ignore in filecount input ( #5483 )
2019-02-26 14:03:25 -08:00
04f3c4321c
Fix several influx parser issues ( #5484 )
...
- Add line/column position
- Allow handlers to return errors
- Fix tag value escaping
- Allow newline in string fields
2019-02-26 10:48:41 -08:00
b34ad9efc4
update sample config for prometheus output client
...
Signed-off-by: Robert Sullivan <rsullivan@pivotal.io>
2019-02-26 11:46:49 -07:00
a85833ae53
replace gomega with require in prometheus output client tests
...
Signed-off-by: Robert Sullivan <rsullivan@pivotal.io>
2019-02-26 11:34:50 -07:00
5253cbfa01
Add ceph_health metrics to ceph input ( #5482 )
2019-02-25 16:02:30 -08:00
7fa8b33066
Add backwards compatibility fields in ceph usage and pool stats ( #5466 )
2019-02-25 15:32:05 -08:00
9d8a574ac7
Add kinesis input plugin ( #5341 )
2019-02-25 12:02:57 -08:00
1886676e14
Support configuring a default timezone in JSON parser ( #5472 )
2019-02-25 11:30:33 -08:00
eb794ec30f
Log the protocol and address that socket_listener is listening on ( #5454 )
2019-02-25 11:11:25 -08:00
0882479cbf
Add command logging to snmp input at debug level ( #5474 )
2019-02-25 11:04:34 -08:00
9e0248898f
Disable results by row in azuredb query ( #5467 )
2019-02-25 10:54:19 -08:00
05af32b191
Clean up TLS configuration in prometheus_client output plugin
...
Signed-off-by: Jesse Weaver <jeweaver@pivotal.io>
2019-02-22 15:26:32 -07:00
c9fb1fcdca
Add mutual TLS support to prometheus_client output plugin
...
Signed-off-by: Robert Sullivan <rsullivan@pivotal.io>
2019-02-22 12:19:29 -07:00
5f1bc9e49f
Accept values with a negative exponent in wavefront parser ( #5462 )
2019-02-21 14:49:52 -08:00
33dfbfdf5e
Fix delete in place of keys in stackdriver output ( #5465 )
2019-02-21 12:19:50 -08:00
0a2cc3ac3f
Update link to grok built in patterns
2019-02-21 12:11:00 -08:00
3c95b25588
Update link to grok built in patterns
2019-02-21 12:08:59 -08:00
f8cc9719a2
Document how to increase the file limit in the ping input
2019-02-20 17:57:39 -08:00
0a01713bcc
Retry restarting receiver on PubSub service error ( #5458 )
2019-02-20 17:33:56 -08:00
6add84eb25
Support Azure Sovereign Environments with endpoint_url option ( #5453 )
2019-02-20 15:16:23 -08:00
843d842d02
Add stackdriver input plugin ( #5406 )
2019-02-20 13:23:59 -08:00
5823fefb7a
Group stackdriver requests to send one point per timeseries ( #5407 )
2019-02-20 13:16:02 -08:00
5dfa3fa769
Fix InfluxDB output UDP line splitting ( #5439 )
2019-02-19 15:08:54 -08:00
e586fdb27f
Append host if arguments are specified for ping input ( #5450 )
2019-02-19 11:18:15 -08:00
ab1a1b075d
Disable export_timestamp by default in prometheus output
2019-02-14 15:09:12 -08:00
3e9703a573
Add rcode tag and field to dns_query input ( #5417 )
2019-02-12 17:57:20 -08:00
ee5827ccbd
Remove error log when snmp6 directory does not exists with nstat input ( #5403 ) ( #5413 )
2019-02-12 16:17:09 -08:00
c0bb8625dc
Add resource path based filtering to vsphere input ( #5165 )
2019-02-12 14:05:14 -08:00
ddf35ddaf3
Note how to use all namespaces in kube_inventory ( #5416 )
2019-02-12 11:36:22 -08:00
c08b454af4
Fix typos in mqtt output documentation
2019-02-11 17:25:25 -08:00
0084138bc6
Add option to set retain flag on messages in mqtt output ( #4892 )
2019-02-11 17:22:31 -08:00
c8832a28c4
Set deadlock priority in sqlserver input ( #5301 )
2019-02-11 17:10:42 -08:00
c612f707f4
Comment out optional parameters to stackdriver output
2019-02-11 14:58:30 -08:00
16a7ce39da
Add internal metric for line too long in influxdb_listener ( #5396 )
2019-02-11 12:49:06 -08:00
3f9860a685
Add resource type and resource label support to stackdriver output ( #5391 )
2019-02-08 12:13:33 -08:00
7f54ae18b5
Send metrics in ascending time order in stackdriver output ( #5385 )
2019-02-06 14:17:51 -08:00
d4ab5da34f
Skip string fields in stackdriver output ( #5384 )
2019-02-05 18:22:42 -08:00
f54da4d748
Update changelog/csv parser docs
2019-02-05 17:45:44 -08:00
10ac030502
Unify time parsing in json/csv parsers ( #5382 )
2019-02-05 17:43:35 -08:00
1137fa50ad
Continue checking cert from other sources if error occurs ( #5381 )
2019-02-05 17:38:04 -08:00
cce160322e
Replace subscription with topic in the pubsub output plugin ( #5378 )
2019-02-05 11:04:51 -08:00
94de223916
Add kube_inventory input plugin ( #5110 )
2019-02-04 12:28:43 -08:00
00734c56c4
Return new Syslog instance for each plugin ( #5372 )
2019-02-04 11:21:16 -08:00
6b144db504
Remove unimplemented auth options from azure_monitor documentation ( #5348 )
2019-02-04 11:19:04 -08:00
35381707db
Fix grammar in influxdb_v2 README
2019-02-01 12:27:31 -08:00
8e46414da2
Clean pubsub sample config
2019-02-01 12:27:31 -08:00
2857f07af9
Add stats option to basicstats sample config
2019-02-01 12:27:31 -08:00
d207269a30
Added performance section to vsphere README ( #5353 )
2019-01-29 17:32:48 -08:00
a15305385f
Add carbon2 serializer ( #5345 )
2019-01-25 18:06:08 -08:00
4ca0a04df1
Removing authentication from the /ping route to match influxdb ( #5316 )
2019-01-25 12:57:35 -08:00
7a229e25a6
Update sudo config recommendation ( #5337 )
2019-01-24 10:54:25 -08:00
35d18d3fd7
Update multifile plugin docs
2019-01-23 17:26:50 -08:00
7a031c48cd
Add multifile input plugin ( #5256 )
2019-01-23 16:23:58 -08:00
d1610d50e6
Always send basic auth in jenkins input ( #5329 )
2019-01-23 14:17:57 -08:00
17460be771
List deprecation version for consul datacentre
2019-01-23 14:12:19 -08:00
f739ce2a35
Use datacenter option spelling in consul input ( #5320 )
2019-01-23 14:10:38 -08:00
efbc83c8b6
Document that sqlserver input requires SP3
2019-01-22 15:47:57 -08:00
b2f6fd685d
Update link to InfluxDB v2.x
2019-01-22 15:29:46 -08:00
5acf2e6ed7
Update filecount docs
2019-01-22 14:13:15 -08:00
5b85569316
Cleanup logs in kinesis output ( #5328 )
2019-01-22 14:05:20 -08:00
cf10d03bb9
Remove credentials from cluster tag in couchbase ( #5313 )
2019-01-18 11:43:24 -08:00
b6cc324d10
Add note on performance to grok parser documentation ( #5291 )
2019-01-17 12:00:07 -08:00
3380fdf69d
Add option to report input timestamp in prometheus output ( #5292 )
2019-01-17 10:51:18 -08:00
b620a56d21
Collect from newly discovered/launched pods ( #5293 )
2019-01-16 15:49:24 -08:00
2b8729e048
Fix typo in mongodb field name ( #5299 )
2019-01-16 15:39:55 -08:00
50ba5c15a4
Support passing bearer token directly in k8s input ( #5295 )
2019-01-15 15:26:18 -08:00
d759b46345
Support passing bearer token directly in prometheus input ( #5294 )
2019-01-15 15:25:26 -08:00
e404e5145b
Add nginx_upstream_check input plugin ( #4303 )
2019-01-15 12:56:40 -08:00
193aba8673
Ack delivery if it is unparseable in amqp_consumer input ( #5286 )
2019-01-15 11:48:36 -08:00
df33759711
Add flush_total_time_ns and additional wired tiger fields to mongodb input ( #5273 )
2019-01-15 11:31:51 -08:00
ccfd9ca522
Update mongodb readme
2019-01-10 14:38:13 -08:00
e20ba1e2b6
Fix intermittent test cases in cloud_pubsub ( #5271 )
2019-01-09 15:55:57 -08:00
4b3580cceb
Add raw counters to mongodb input ( #5264 )
2019-01-09 15:48:45 -08:00
10b3e45775
Sort fields in nowmetric test
2019-01-08 17:57:38 -08:00
f5f85aa74f
Add GCP Cloud Pubsub output plugin ( #5202 )
2019-01-08 15:53:02 -08:00
2474a3a54b
Remove unsupported parallel testing
2019-01-08 15:43:50 -08:00
c9d8be9ab5
Update changelog and docs for nowmetric serializer
2019-01-08 15:32:49 -08:00
e6724bfb7c
Add ServiceNow serializer ( #4809 )
2019-01-08 15:28:00 -08:00
dd20b1cd10
Update changelog and docs for neptune_apex plugin
2019-01-08 15:09:36 -08:00
4125e4161c
Add input plugin for Neptune Apex aquarium controller ( #5191 )
2019-01-08 15:02:32 -08:00
1c3acafc8f
Fix arithmetic overflow in sqlserver input ( #5261 )
2019-01-08 14:13:14 -08:00
84139cf890
Use gofmt from Go 1.11 ( #5259 )
2019-01-07 17:14:07 -08:00
9800779e64
Fix err in graphite parser_test ( #5257 )
2019-01-07 11:30:48 -08:00
9dc9bd653a
Document response_string_match field in http_response ( #5251 )
2019-01-07 11:25:08 -08:00
39022cd2f4
Fix typo in graylog documentation ( #5253 )
2019-01-07 11:05:22 -08:00
0afa99c17b
Update changelog and supporting files for cloud_pubsub
2019-01-03 16:28:15 -08:00
f42d9378ba
Add cloud_pubsub input plugin ( #5136 )
2019-01-03 16:20:07 -08:00
723d8f0104
Fix panic in docker input with bad endpoint ( #5226 )
2019-01-03 15:57:39 -08:00
3c4e737f6b
Add example to topk readme. Fix defaults to skip loop ( #5220 )
2019-01-03 12:06:56 -08:00
bd54e4a002
Update readme for varnish input
2019-01-03 11:35:13 -08:00
3f158429bc
Add configurable timeout to varnish input ( #5214 )
2019-01-03 11:33:04 -08:00
3356f1dc82
Fix discovery race condition in vsphere input ( #5217 )
2019-01-03 11:30:05 -08:00
4e35732279
Fix toml option names in parser processor ( #5218 )
2019-01-02 13:55:59 -08:00
bc45629b70
Allow non local udp connections in net_response ( #5219 )
2019-01-02 13:53:58 -08:00
bf7a42643e
Add read and write op per second fields ( #5210 )
2019-01-02 13:06:54 -08:00
df6fbdb1e8
Fix unittests for new year ( #5213 )
2019-01-02 11:12:04 -08:00
78c1ffbf27
Improve scalability of vsphere input ( #5113 )
2018-12-28 13:24:43 -08:00
cb9bacfede
Add forwarded records to sqlserver input ( #5177 )
2018-12-27 13:18:29 -08:00
3fbfe3acd2
Fix usage of loop variable in function closure ( #5195 )
2018-12-27 13:08:19 -08:00
dbe6f594a9
Allow floats in valuecounter aggregator ( #5168 )
2018-12-26 19:39:34 -08:00
10a067a699
Add PDH_NO_DATA to known counter error codes in win_perf_counters ( #5182 )
2018-12-26 14:51:31 -08:00
9cc06702da
Use wavefront sdk in wavefront output ( #5161 )
2018-12-21 11:26:07 -08:00
ce8ec24100
Document using posix acl in disk input
2018-12-20 12:12:25 -08:00
5027a516c7
Even more fix link in grok documentation
2018-12-19 16:25:06 -08:00
76f8d294e4
Even more fix link in grok documentation
2018-12-19 16:24:00 -08:00
2c3fa0907e
Even more fix link in grok documentation
2018-12-19 16:22:43 -08:00
d043da1976
Fix link in grok documentation
2018-12-19 16:17:17 -08:00
e85e6bd3e7
Fix num_remapped_pgs field in ceph plugin ( #5167 )
2018-12-19 15:51:24 -08:00
841860890f
Add support for basic auth to couchdb input ( #5160 )
2018-12-19 12:59:27 -08:00
f530ca6e7c
Use godirwalk in globpath ( #5145 )
2018-12-18 14:23:25 -08:00
7caa5d20af
Fix invalid JSON in readme ( #5158 )
2018-12-18 12:21:36 -08:00
697381d4b5
Add support for non-transparent framing of syslog messages ( #5148 )
2018-12-18 10:54:38 -08:00
6ef331efeb
Add micro and nanosecond unix timestamp support to JSON parser ( #5149 )
2018-12-14 14:38:01 -08:00
891eff0930
Run stop logic only if required in prometheus input ( #5144 )
2018-12-14 14:34:05 -08:00
98231f8b6b
Fix converter processor example ( #5146 )
2018-12-14 10:56:21 -08:00
8906e2796b
Add size to filecount input ( #4778 )
2018-12-13 12:25:49 -08:00
f794d5b08a
Fix error sending empty tag value in azure monitor output ( #5083 )
2018-12-13 11:57:03 -08:00
8526aa5c87
Update changelog
2018-12-13 11:51:53 -08:00
6b5ddbbf66
Include DEVLINKS in available diskio udev properties ( #5116 )
2018-12-13 11:49:19 -08:00
503f3ce0a6
Remove storage calculation for non Azure managed instances and add server version ( #5135 )
...
- Removed the storage calculation for SQL Server instances that are NOT Azure
Managed Instances, this reduces the time it takes to get this data on an
instance with a lot of databases and/or database files.
- Added the SQL Server version back to the server properties query.
2018-12-13 11:42:35 -08:00
4d3519756c
Add support for sending a request body to http input ( #5074 )
2018-12-11 19:12:00 -08:00
cf2b85f383
Add running field to procstat_lookup ( #5069 )
2018-12-11 19:11:33 -08:00
d954218f75
Increase varnishstat timeout ( #5130 )
2018-12-11 16:57:08 -08:00
04dfa430ef
Allow delta metrics in wavefront parser ( #5115 )
2018-12-10 16:42:25 -08:00
1170367dd7
Use -W flag on bsd variants in ping input ( #5112 )
2018-12-10 16:20:04 -08:00
83bc3d1277
Improve docs to clarify common issues ( #5054 )
2018-12-10 16:14:20 -08:00
d0a6051fd7
Prevent panic when marking the offset in kafka_consumer ( #5118 )
2018-12-10 15:55:58 -08:00
adce43f546
Fix grammar and typos in fluentd README.md ( #5127 )
2018-12-10 15:24:11 -08:00
7479352e4a
Rename interrupts cpu_as_tags to cpu_as_tag; update readme
2018-11-30 15:00:38 -08:00
9a637eda05
Switch CPU from field to tag in interrupts input plugin ( #4999 ) ( #5024 )
2018-11-30 14:42:55 -08:00
1d6db08dc8
Update changelog
2018-11-29 16:07:56 -08:00
fc7fba9020
Use Telegraf as value for graylog x-requested-by header
2018-11-28 16:52:40 -08:00
ba612b670b
Add X-Requested-By header to graylog input ( #5011 )
2018-11-28 16:52:03 -08:00
55b798bd20
Fix mongodb document stats ( #5049 )
2018-11-28 16:43:13 -08:00
448c98d82e
Add ability to tag metrics with topic in kafka_consumer ( #5038 )
2018-11-28 16:29:26 -08:00
a26aaa5e03
Add support for unix_ms timestamps in csv parser.
2018-11-28 16:19:53 -08:00
f9113b63b7
Add csv parser unix timestamp support ( #5047 )
2018-11-28 16:07:25 -08:00
9bc92c5c75
Fix server connection info in mongodb input ( #5048 )
2018-11-27 17:45:23 -08:00
6d2fb0027c
Set default config values in jenkins input ( #5046 )
2018-11-27 17:26:22 -08:00
85ee354255
Fix boolean handling in splunkmetric serializer ( #5008 )
2018-11-21 17:43:42 -08:00
f57b019e22
Fix link to http_listener_v2
2018-11-20 15:23:14 -08:00
0772076378
Allow for force gathering ES cluster stats ( #4345 )
2018-11-19 11:53:09 -08:00
9c9511bde9
Be specific about required csv header definition ( #5007 )
2018-11-19 11:27:21 -08:00
d8e3c1d434
Prevent panic in influxdb_listener ( #4997 )
2018-11-16 10:51:06 -08:00
140387d2c3
Log warning when wireless plugin is used on unsupported platform ( #4986 )
2018-11-15 15:45:56 -08:00
46b340c899
Handle non-tls columns for mysql input ( #4973 )
2018-11-15 15:45:18 -08:00
274af39a5e
Update kubernetes input docs ( #4990 )
2018-11-15 15:43:47 -08:00
b6fd7c5aab
Add troubleshooting section to disk input README
2018-11-14 11:40:11 -08:00
56f2c435e7
Add udp url note to influxdb output sample config
2018-11-12 16:06:23 -08:00
41c8fd7e93
Clarify UDP influxdb endpoint ( #4974 )
2018-11-12 16:05:28 -08:00
fbd3e7887a
Update dovecot readme
2018-11-09 16:43:15 -08:00
2d782fbaac
Fix potential missing datastore metrics in vSphere plugin ( #4968 )
2018-11-06 14:22:43 -08:00
0e07bbb877
Fix option names in json parser docs
2018-11-05 17:15:07 -08:00
3b0cee346c
Add jenkins input plugin ( #4289 )
2018-11-05 14:19:08 -08:00
6e5c2f8bb6
Remove outputs blocking inputs when output is slow ( #4938 )
2018-11-05 13:34:28 -08:00
74667cd681
Fix toml struct tag in win_service #4811 ( #4936 )
2018-11-05 13:33:02 -08:00
9c866553e8
Add scraping for Prometheus endpoint in Kubernetes ( #4920 )
2018-11-05 13:30:16 -08:00
19a338b922
Update to source tag in nginx_vts readme
2018-11-02 18:23:41 -07:00
9a864d11d2
Add nginx-module-vts input plugin. ( #3782 )
2018-11-02 18:18:40 -07:00
ad320ac1e0
Remove the time_key from the field values in JSON parser ( #4951 )
2018-11-02 17:53:45 -07:00
ddcbfe79bb
Allow connecting to prometheus via unix socket ( #4798 )
2018-11-02 17:51:40 -07:00
ad5fcf8efb
Improve error description in influxdb_v2 output ( #4952 )
2018-11-02 17:50:55 -07:00
69170d24bc
Add LUN to datasource translation in vsphere input ( #4934 )
2018-11-02 12:05:28 -07:00
2a9bef64ae
Update opensmtpd readme
2018-11-02 11:00:47 -07:00
f0f99d18e0
Update ipvs readme
2018-11-02 10:59:14 -07:00
1ec6c8e333
Add metrics for real servers to ipvs ( #4929 )
2018-11-02 10:48:43 -07:00
7fa4db0795
Fix broken link to vSphere METRICS.md ( #4945 )
2018-11-01 12:25:27 -07:00
69d21a5876
Fix version check in postgresql_extensible ( #4866 )
2018-10-30 15:06:47 -06:00
0003c8fba7
Don't add unserializable fields to jolokia2 input ( #4930 )
2018-10-30 15:06:05 -06:00
d0e6da5eba
Handle panic when ipmi_sensor input gets bad input ( #4937 )
2018-10-30 15:05:41 -06:00
563b6766ce
Log the correct error in jti_openconfig ( #4901 )
2018-10-30 15:05:18 -06:00
9fcd279b7e
Run gofmt with Go 1.10
2018-10-29 16:12:37 -07:00
f38da90329
Run `make fmt` with Go 1.11
2018-10-29 16:00:54 -07:00
b24e03b597
Add wireless input plugin ( #3847 )
2018-10-29 15:57:39 -07:00
742a74dcf0
Use default partition key when tag does not exist in kinesis output ( #4904 )
2018-10-25 23:51:14 -07:00
21208d2686
Prevent connection leak by closing unused connections in amqp output ( #4924 )
2018-10-25 23:37:18 -07:00
133fabc672
Update ipvs readme for style
2018-10-25 12:44:43 -07:00
b88436c9d7
Add IPVS input plugin ( #4890 )
2018-10-25 12:14:19 -07:00
67cd2888db
Collect additional stats in memcached input ( #4914 )
2018-10-24 15:02:44 -07:00
8d0ec993c7
Update changelog and add basic nsq input readme
2018-10-22 17:55:40 -07:00
12279042d3
Add support for TLS configuration in NSQ input ( #3903 )
2018-10-22 17:50:32 -07:00
2e59e4dd6c
Add deprecation version for MetricBuffer
2018-10-22 17:16:24 -07:00
ff98ad710b
Add Nginx Plus API input ( #4837 )
2018-10-22 12:54:50 -07:00
2f7450ec04
Document units of filestat modification time
2018-10-22 12:41:37 -07:00
ee056278f5
Enable gofmt code simplification ( #4887 )
2018-10-19 13:32:54 -07:00
589d0587f6
Add ability to specify bytes options as strings with units (KB, MiB, ...) ( #4852 )
2018-10-19 11:17:18 -07:00
17360f079c
Fix spelling mistakes ( #4888 )
2018-10-19 11:12:01 -07:00
1af2cf902c
Add new DN tags to x509_cert readme
2018-10-18 23:34:59 -07:00
d33116381b
Add certificate distinguished name as a tags in x509_cert input ( #4873 )
2018-10-18 23:32:43 -07:00
f5af2ab799
Remove dead link from logparser sampleconfig and fix syntax ( #4883 )
2018-10-18 23:26:42 -07:00
136a5724bd
Use DescribeStreamSummary in place of ListStreams in kinesis output ( #4864 )
2018-10-18 13:05:43 -07:00
7cb75ca979
Add more detailed descriptions for fields in swap input ( #4763 )
2018-10-18 12:59:03 -07:00
6e8b7e3cc6
Fix panic in logparser input ( #4849 )
2018-10-17 13:02:03 -06:00
48745c3171
Fix segfault in x509_cert ( #4874 )
2018-10-17 12:46:44 -06:00
f10de93da4
Return correct response code on ping input ( #4875 )
2018-10-17 12:46:00 -06:00
cd865cfd22
Lower authorization errors to debug level in mongodb input ( #4869 )
2018-10-17 12:44:48 -06:00
106f5b5ca8
Update changelog
2018-10-16 12:23:05 -07:00
0b601513a2
Add stackdriver output plugin ( #3876 )
2018-10-16 11:47:10 -07:00
Robert Edström
Greg
Daniel Nelson
Max Eshleman
Douglas Drinka
Robert Sullivan
Jesse Weaver
Pierre Tessier
Nicolas Bazire
Daniel Nelson
emily
Andrew Ernst
Olli-Pekka Lehto
Tomas Barton
Pontus Rydin
Paweł Kraszewski
Phil Schwartz
Ami Blonder
Frank Reno
Jeff Ashton
vignemail1
Martin Pittermann
Marcelo Almeida
Artem V. Navrotskiy
Dmitry Ilyin
JefMuller
Max Renaud
j2gg0s
hydrandt
Mark Amery
Kamil Szczygieł
svenwiltink
BoheeChoi1
Nic Grobler
Maciej Mencner
Samuel-BF
Adrián López
Leonardo Di Donato
Ruud Bijnen
Raphael Couto
dbergmanskytap
Mark Wilkinson - m82labs
Lasse Karstensen
Robert Fisher
Alexander Thaller
Emmanuel Nosa Evbuomwan
Wojciech Kudla
gurayyildirim
Sebastien Le Digabel
Felipe Dutra Tine e Silva
Mauro Murari
Jeppe Fihl-Pearson
Lance O'Connor
Pierre Fersing
Ivan Vandot
kelwang
Aleksejs Sinicins
Akshay Moghe
Dylan Khor
Beaujolais !
James Maidment
Marcos Nils
Mikhail Leonov
Soulou
Bugagazavr
Trevor Pounds
Onur Güzel
Dirk Pahl
Greg
Fred Cox