Skip to content

Commit 5990885

Browse files
committed
taxonomy.UNKNOWN instead of none
1 parent e5bcebd commit 5990885

File tree

2 files changed

+98
-3
lines changed

2 files changed

+98
-3
lines changed

ChangeLog

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,77 @@
11
CHANGES
22
=======
33

4+
* taxonomy.UNKNOWN instead of none
5+
* include initiator project and domain name in environ
6+
* include names
7+
* it's stable
8+
9+
1.0.27
10+
------
11+
12+
* Replace timestamps; fix nova metadata calls (#7)
13+
14+
1.0.26
15+
------
16+
17+
* Use millisecond resolution for timers, since the statsd exporter expects it that way and buckets are filled wrong otherwise: https://github.com/prometheus/statsd\_exporter/blob/master/exporter.go#L407
18+
* Use millisecond resolution for timers, since the statsd exporter expects it that way and buckets are filled wrong otherwise: https://github.com/prometheus/statsd\_exporter/blob/master/exporter.go#L407
19+
20+
1.0.25
21+
------
22+
23+
* also detect keystone ec2/s3 token authentications
24+
25+
1.0.24
26+
------
27+
28+
* also add cadf service name, initiator project domain id, initiator user domain id to environ
29+
* added an entrypoint for flask based deployments
30+
31+
1.0.23
32+
------
33+
34+
* add status label back to api\_requests\_total
35+
36+
1.0.22
37+
------
38+
39+
* exclude uids from latency metrics
40+
41+
1.0.21
42+
------
43+
44+
* document all configuration options
45+
* make it possible to include a user-id label in all requests. (#4)
46+
47+
1.0.20
48+
------
49+
50+
* include initiator user id in metric for ks auth req
51+
52+
1.0.19
53+
------
54+
55+
* fix test name
56+
57+
1.0.18
58+
------
59+
60+
* add barbican support, tests
61+
62+
1.0.17
63+
------
64+
65+
* fix request.content\_type if WebOb<1.7.4
66+
67+
1.0.16
68+
------
69+
70+
* logging to debug. manila parse json body fix
71+
72+
1.0.15
73+
------
74+
475
* fix name mapping. use path\_keywords
576

677
1.0.14
@@ -53,12 +124,36 @@ CHANGES
53124
-----
54125

55126
* readme
127+
128+
v1.0.5
129+
------
130+
56131
* Latency and status (#3)
132+
133+
v1.0.4
134+
------
135+
57136
* enable check body of authentication requests
137+
138+
v1.0.3
139+
------
140+
58141
* client\_addr->host\_address
59142
* add /endpoints and test
143+
144+
v1.0.2
145+
------
146+
60147
* [swift] it's not /v1/info but /info
148+
149+
v1.0.1
150+
------
151+
61152
* dry requirements
153+
154+
v1.0.0
155+
------
156+
62157
* bump to 1.0.0
63158
* fix logging
64159
* default target.project\_id to initiator.project\_id if discovery fails

watcher/watcher.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
# under the License.
1414

1515
import logging
16-
import yaml
1716
import time
17+
import yaml
1818

1919
from datadog.dogstatsd import DogStatsd
2020
from pycadf import cadftaxonomy as taxonomy
2121
from webob import Request
2222

23+
from . import cadf_strategy as strategies
2324
from . import common
2425
from . import errors
25-
from . import cadf_strategy as strategies
2626

2727
logging.basicConfig(level=logging.ERROR, format='%(asctime)-15s %(message)s')
2828

@@ -247,7 +247,7 @@ def _start_response_wrapper(status, headers, exc_info=None):
247247
if status:
248248
status_code = status.split()[0]
249249
else:
250-
status_code = 'none'
250+
status_code = taxonomy.UNKNOWN
251251

252252
labels.append("status:{0}".format(status_code))
253253
detail_labels.append("status:{0}".format(status_code))

0 commit comments

Comments
 (0)