diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 642d97ebe54..8c8858da203 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1043,6 +1043,11 @@ "Comment": "v0.23.2-63-ge47efa0", "Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" }, + { + "ImportPath": "github.com/google/cadvisor/client/v2", + "Comment": "v0.23.2-63-ge47efa0", + "Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" + }, { "ImportPath": "github.com/google/cadvisor/collector", "Comment": "v0.23.2-63-ge47efa0", diff --git a/Godeps/LICENSES b/Godeps/LICENSES index af322ca35d5..0c358708663 100644 --- a/Godeps/LICENSES +++ b/Godeps/LICENSES @@ -33571,6 +33571,204 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ================================================================================ +================================================================================ += vendor/github.com/google/cadvisor/client/v2 licensed under: = + + Copyright 2014 The cAdvisor Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + += vendor/github.com/google/cadvisor/LICENSE e7790b946bfacb700e8a8f2baedb3205 - +================================================================================ + + ================================================================================ = vendor/github.com/google/cadvisor/collector licensed under: = diff --git a/vendor/github.com/google/cadvisor/client/v2/README.md b/vendor/github.com/google/cadvisor/client/v2/README.md new file mode 100644 index 00000000000..64cc30d5ce6 --- /dev/null +++ b/vendor/github.com/google/cadvisor/client/v2/README.md @@ -0,0 +1,69 @@ +# Example REST API Client + +This is an implementation of a cAdvisor REST API in Go. You can use it like this: + +```go +client, err := client.NewClient("http://192.168.59.103:8080/") +``` + +Obviously, replace the URL with the path to your actual cAdvisor REST endpoint. + + +### MachineInfo + +```go +client.MachineInfo() +``` + +There is no v2 MachineInfo API, so the v2 client exposes the [v1 MachineInfo](../../info/v1/machine.go#L131) + +``` +(*v1.MachineInfo)(0xc208022b10)({ + NumCores: (int) 4, + MemoryCapacity: (int64) 2106028032, + Filesystems: ([]v1.FsInfo) (len=1 cap=4) { + (v1.FsInfo) { + Device: (string) (len=9) "/dev/sda1", + Capacity: (uint64) 19507089408 + } + } +}) +``` + +You can see the full specification of the [MachineInfo struct in the source](../../info/v1/machine.go#L131) + +### VersionInfo + +```go +client.VersionInfo() +``` + +This method returns the cAdvisor version. + +### Attributes + +```go +client.Attributes() +``` + +This method returns a [cadvisor/info/v2/Attributes](../../info/v2/machine.go#L24) struct with all the fields filled in. Attributes includes hardware attributes (as returned by MachineInfo) as well as software attributes (eg. software versions). Here is an example return value: + +``` +(*v2.Attributes)({ + KernelVersion: (string) (len=17) "3.13.0-44-generic" + ContainerOsVersion: (string) (len=18) "Ubuntu 14.04.1 LTS" + DockerVersion: (string) (len=9) "1.5.0-rc4" + CadvisorVersion: (string) (len=6) "0.10.1" + NumCores: (int) 4, + MemoryCapacity: (int64) 2106028032, + Filesystems: ([]v2.FsInfo) (len=1 cap=4) { + (v2.FsInfo) { + Device: (string) (len=9) "/dev/sda1", + Capacity: (uint64) 19507089408 + } + } +}) +``` + +You can see the full specification of the [Attributes struct in the source](../../info/v2/machine.go#L24) + diff --git a/vendor/github.com/google/cadvisor/client/v2/client.go b/vendor/github.com/google/cadvisor/client/v2/client.go new file mode 100644 index 00000000000..716517c3381 --- /dev/null +++ b/vendor/github.com/google/cadvisor/client/v2/client.go @@ -0,0 +1,176 @@ +// Copyright 2015 Google Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Client library to programmatically access cAdvisor API. +package v2 + +import ( + "bytes" + "encoding/json" + "fmt" + "io/ioutil" + "net/http" + "net/url" + "path" + "strconv" + "strings" + + v1 "github.com/google/cadvisor/info/v1" + "github.com/google/cadvisor/info/v2" +) + +// Client represents the base URL for a cAdvisor client. +type Client struct { + baseUrl string +} + +// NewClient returns a new client with the specified base URL. +func NewClient(url string) (*Client, error) { + if !strings.HasSuffix(url, "/") { + url += "/" + } + + return &Client{ + baseUrl: fmt.Sprintf("%sapi/v2.1/", url), + }, nil +} + +// MachineInfo returns the JSON machine information for this client. +// A non-nil error result indicates a problem with obtaining +// the JSON machine information data. +func (self *Client) MachineInfo() (minfo *v1.MachineInfo, err error) { + u := self.machineInfoUrl() + ret := new(v1.MachineInfo) + if err = self.httpGetJsonData(ret, nil, u, "machine info"); err != nil { + return + } + minfo = ret + return +} + +// MachineStats returns the JSON machine statistics for this client. +// A non-nil error result indicates a problem with obtaining +// the JSON machine information data. +func (self *Client) MachineStats() ([]v2.MachineStats, error) { + var ret []v2.MachineStats + u := self.machineStatsUrl() + err := self.httpGetJsonData(&ret, nil, u, "machine stats") + return ret, err +} + +// VersionInfo returns the version info for cAdvisor. +func (self *Client) VersionInfo() (version string, err error) { + u := self.versionInfoUrl() + version, err = self.httpGetString(u, "version info") + return +} + +// Attributes returns hardware and software attributes of the machine. +func (self *Client) Attributes() (attr *v2.Attributes, err error) { + u := self.attributesUrl() + ret := new(v2.Attributes) + if err = self.httpGetJsonData(ret, nil, u, "attributes"); err != nil { + return + } + attr = ret + return +} + +// Stats returns stats for the requested container. +func (self *Client) Stats(name string, request *v2.RequestOptions) (map[string]v2.ContainerInfo, error) { + u := self.statsUrl(name) + ret := make(map[string]v2.ContainerInfo) + data := url.Values{ + "type": []string{request.IdType}, + "count": []string{strconv.Itoa(request.Count)}, + "recursive": []string{strconv.FormatBool(request.Recursive)}, + } + + u = fmt.Sprintf("%s?%s", u, data.Encode()) + if err := self.httpGetJsonData(&ret, nil, u, "stats"); err != nil { + return nil, err + } + return ret, nil +} + +func (self *Client) machineInfoUrl() string { + return self.baseUrl + path.Join("machine") +} + +func (self *Client) machineStatsUrl() string { + return self.baseUrl + path.Join("machinestats") +} + +func (self *Client) versionInfoUrl() string { + return self.baseUrl + path.Join("version") +} + +func (self *Client) attributesUrl() string { + return self.baseUrl + path.Join("attributes") +} + +func (self *Client) statsUrl(name string) string { + return self.baseUrl + path.Join("stats", name) +} + +func (self *Client) httpGetResponse(postData interface{}, urlPath, infoName string) ([]byte, error) { + var resp *http.Response + var err error + + if postData != nil { + data, marshalErr := json.Marshal(postData) + if marshalErr != nil { + return nil, fmt.Errorf("unable to marshal data: %v", marshalErr) + } + resp, err = http.Post(urlPath, "application/json", bytes.NewBuffer(data)) + } else { + resp, err = http.Get(urlPath) + } + if err != nil { + return nil, fmt.Errorf("unable to post %q to %q: %v", infoName, urlPath, err) + } + if resp == nil { + return nil, fmt.Errorf("received empty response for %q from %q", infoName, urlPath) + } + defer resp.Body.Close() + body, err := ioutil.ReadAll(resp.Body) + if err != nil { + err = fmt.Errorf("unable to read all %q from %q: %v", infoName, urlPath, err) + return nil, err + } + if resp.StatusCode != 200 { + return nil, fmt.Errorf("request %q failed with error: %q", urlPath, strings.TrimSpace(string(body))) + } + return body, nil +} + +func (self *Client) httpGetString(url, infoName string) (string, error) { + body, err := self.httpGetResponse(nil, url, infoName) + if err != nil { + return "", err + } + return string(body), nil +} + +func (self *Client) httpGetJsonData(data, postData interface{}, url, infoName string) error { + body, err := self.httpGetResponse(postData, url, infoName) + if err != nil { + return err + } + if err = json.Unmarshal(body, data); err != nil { + err = fmt.Errorf("unable to unmarshal %q (Body: %q) from %q with error: %v", infoName, string(body), url, err) + return err + } + return nil +}