@@ -52,23 +52,24 @@ func (cc *ConohaCollector) AutoUpdate() {
52
52
// オブジェクトストレージへのリクエスト数を取得
53
53
requests , err := cc .ObjectStorageRequests ()
54
54
if err != nil {
55
- log .Fatal (err )
55
+ log .Printf ("ObjectStorageRequests error: %v\n " , err )
56
+ } else {
57
+ metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [0 ], prometheus .GaugeValue , requests ["get" ], "get" ))
58
+ metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [0 ], prometheus .GaugeValue , requests ["put" ], "put" ))
59
+ metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [0 ], prometheus .GaugeValue , requests ["delete" ], "delete" ))
56
60
}
57
- metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [0 ], prometheus .GaugeValue , requests ["get" ], "get" ))
58
- metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [0 ], prometheus .GaugeValue , requests ["put" ], "put" ))
59
- metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [0 ], prometheus .GaugeValue , requests ["delete" ], "delete" ))
60
61
61
62
// オブジェクトストレージ使用容量を取得
62
63
usage , err := cc .ObjectStorageUsage ()
63
64
if err != nil {
64
- log .Fatal ( err )
65
- }
66
- metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [1 ], prometheus .GaugeValue , usage .quota ))
67
- metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [2 ], prometheus .GaugeValue , usage .totalUsage ))
68
-
69
- for _ , container := range usage . containers {
70
- metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [3 ], prometheus .GaugeValue , float64 (container .Bytes ), container .Name ))
71
- metrics = append ( metrics , prometheus . MustNewConstMetric ( cc . describes [ 4 ], prometheus . GaugeValue , float64 ( container . Count ), container . Name ))
65
+ log .Printf ( "ObjectStorageUsage error: %v \n " , err )
66
+ } else {
67
+ metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [1 ], prometheus .GaugeValue , usage .quota ))
68
+ metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [2 ], prometheus .GaugeValue , usage .totalUsage ))
69
+ for _ , container := range usage . containers {
70
+ metrics = append ( metrics , prometheus . MustNewConstMetric ( cc . describes [ 3 ], prometheus . GaugeValue , float64 ( container . Bytes ), container . Name ))
71
+ metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [4 ], prometheus .GaugeValue , float64 (container .Count ), container .Name ))
72
+ }
72
73
}
73
74
74
75
serviceIDs := make (map [string ]bool )
@@ -77,28 +78,31 @@ func (cc *ConohaCollector) AutoUpdate() {
77
78
// データベース使用状況を取得
78
79
info , err := cc .DatabaseInfo (db .DatabaseID )
79
80
if err != nil {
80
- log .Fatal ( err )
81
- }
82
- metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [5 ], prometheus .GaugeValue , info .DbSize , db .DbName ))
81
+ log .Printf ( "DatabaseInfo(%s) error: %v \n " , db . DatabaseID , err )
82
+ } else {
83
+ metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [5 ], prometheus .GaugeValue , info .DbSize , db .DbName ))
83
84
84
- serviceIDs [db .ServiceID ] = true
85
+ serviceIDs [db .ServiceID ] = true
86
+ }
85
87
}
86
88
87
89
for serviceID := range serviceIDs {
88
90
// データベース上限値/合計使用量取得
89
91
quota , err := cc .DatabaseQuota (serviceID )
90
92
if err != nil {
91
- log .Fatal (err )
93
+ log .Printf ("DatabaseQuota(%s) error: %v\n " , serviceID , err )
94
+ } else {
95
+ metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [6 ], prometheus .GaugeValue , float64 (quota .Quota ), serviceID ))
96
+ metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [7 ], prometheus .GaugeValue , float64 (quota .TotalUsage ), serviceID ))
92
97
}
93
- metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [6 ], prometheus .GaugeValue , float64 (quota .Quota ), serviceID ))
94
- metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [7 ], prometheus .GaugeValue , float64 (quota .TotalUsage ), serviceID ))
95
98
}
96
99
97
100
deposit , err := cc .BillingPaymentSummary ()
98
101
if err != nil {
99
- log .Fatal (err )
102
+ log .Printf ("BillingPaymentSumarry error: %v\n " , err )
103
+ } else {
104
+ metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [8 ], prometheus .GaugeValue , float64 (deposit .Deposit )))
100
105
}
101
- metrics = append (metrics , prometheus .MustNewConstMetric (cc .describes [8 ], prometheus .GaugeValue , float64 (deposit .Deposit )))
102
106
103
107
// メトリクスデータ更新
104
108
cc .Lock ()
0 commit comments