From 5859b74f1bb19cd3121e766f06ed762509571232 Mon Sep 17 00:00:00 2001 From: Bjoern Rabenstein Date: Wed, 21 Jan 2015 20:07:45 +0100 Subject: [PATCH] Clean up license issues. - Move CONTRIBUTORS.md to the more common AUTHORS. - Added the required NOTICE file. - Changed "Prometheus Team" to "The Prometheus Authors". - Reverted the erroneous changes to the Apache License. --- AUTHORS | 19 +++++++ CONTRIBUTORS.md | 7 --- Dockerfile | 2 +- LICENSE | 2 +- MANIFEST | 10 ---- Makefile | 2 +- Makefile.INCLUDE | 2 +- NOTICE | 68 ++++++++++++++++++++++++++ build_info.go | 2 +- config/Makefile | 2 +- config/config.go | 2 +- config/config.proto | 2 +- config/config_test.go | 2 +- config/load.go | 2 +- config/load_test.go | 2 +- main.go | 2 +- notification/notification.go | 2 +- notification/notification_test.go | 2 +- retrieval/helpers_test.go | 2 +- retrieval/ingester.go | 2 +- retrieval/interface_test.go | 2 +- retrieval/target.go | 2 +- retrieval/target_provider.go | 2 +- retrieval/target_test.go | 2 +- retrieval/targetmanager.go | 2 +- retrieval/targetmanager_test.go | 2 +- retrieval/targetpool.go | 2 +- retrieval/targetpool_test.go | 2 +- rules/Makefile | 2 +- rules/alerting.go | 2 +- rules/ast/ast.go | 2 +- rules/ast/functions.go | 2 +- rules/ast/functions_test.go | 2 +- rules/ast/printer.go | 2 +- rules/ast/query_analyzer.go | 2 +- rules/ast/walk.go | 2 +- rules/helpers.go | 2 +- rules/helpers_test.go | 2 +- rules/lexer.l | 2 +- rules/lexer.l.go | 2 +- rules/load.go | 2 +- rules/manager/manager.go | 2 +- rules/parser.y | 2 +- rules/recording.go | 2 +- rules/rules.go | 2 +- rules/rules_test.go | 2 +- stats/query_stats.go | 2 +- stats/timer.go | 2 +- storage/local/chunk.go | 2 +- storage/local/codable/codable.go | 2 +- storage/local/codable/codable_test.go | 2 +- storage/local/delta.go | 2 +- storage/local/index/index.go | 2 +- storage/local/index/interface.go | 2 +- storage/local/index/leveldb.go | 2 +- storage/local/instrumentation.go | 2 +- storage/local/interface.go | 2 +- storage/local/persistence.go | 2 +- storage/local/persistence_test.go | 2 +- storage/local/preload.go | 2 +- storage/local/series.go | 2 +- storage/local/storage.go | 2 +- storage/local/storage_test.go | 2 +- storage/local/test_helpers.go | 2 +- storage/metric/labelpair.go | 2 +- storage/metric/labelpair_test.go | 2 +- storage/metric/matcher.go | 2 +- storage/metric/sample.go | 2 +- storage/remote/opentsdb/client_test.go | 2 +- storage/remote/queue_manager.go | 2 +- storage/remote/queue_manager_test.go | 2 +- templates/templates.go | 2 +- templates/templates_test.go | 2 +- tools/Makefile | 2 +- tools/rule_checker/Makefile | 2 +- tools/rule_checker/main.go | 2 +- travis-helper.sh | 2 +- utility/deadline_client.go | 2 +- utility/set.go | 2 +- utility/set_test.go | 2 +- utility/strconv.go | 2 +- utility/test/directory.go | 2 +- utility/test/error.go | 2 +- utility/test/time.go | 2 +- utility/time.go | 2 +- web/Makefile | 2 +- web/alerts.go | 2 +- web/api/api.go | 2 +- web/api/query.go | 2 +- web/api/targets.go | 2 +- web/blob/Makefile | 2 +- web/consoles.go | 2 +- web/handler.go | 2 +- web/httputils/compression.go | 2 +- web/httputils/httputils.go | 2 +- web/status.go | 2 +- web/web.go | 2 +- 97 files changed, 180 insertions(+), 110 deletions(-) create mode 100644 AUTHORS delete mode 100644 CONTRIBUTORS.md delete mode 100644 MANIFEST create mode 100644 NOTICE diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 000000000..924a0c9f0 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,19 @@ +The Prometheus project was started by Matt T. Proud in 2012. + +The following individuals have contributed code to this repository +(listed in alphabetical order): + +Andres Suarez +Bernerd Schaefer +Björn Rabenstein +Brian Brazil +Conor Hennessy +Johannes 'fish' Ziemke +Julius Volz +Matt T. Proud +Peter Bourgon +Sabra Melamed +Stuart Nelson +Tobias Schmidt +Tomás Senart +Ursula Kallio diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md deleted file mode 100644 index ad4e45942..000000000 --- a/CONTRIBUTORS.md +++ /dev/null @@ -1,7 +0,0 @@ -# Prometheus Team -- Björn Rabenstein -- Brian Brazil -- Johannes Ziemke -- Julius Volz -- Matt T. Proud -- Tobias Schmidt diff --git a/Dockerfile b/Dockerfile index 250b4d25d..f06d7467a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM golang:1.4 -MAINTAINER Prometheus Team +MAINTAINER The Prometheus Authors RUN apt-get -qy update && apt-get -qy install vim-common gcc mercurial && \ go get github.com/tools/godep diff --git a/LICENSE b/LICENSE index b4f8761cf..261eeb9e9 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2013 Prometheus Team + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/MANIFEST b/MANIFEST deleted file mode 100644 index 3d4af3b8a..000000000 --- a/MANIFEST +++ /dev/null @@ -1,10 +0,0 @@ -# 3rd party libraries -web/static/vendor/jqueryui/ jqueryui-1.9.1 -web/static/vendor/rickshaw/ https://github.com/shutterstock/rickshaw/commit/af35a7e7381b23f4438bc416ed604ea98bf39925 -web/static/vendor/jquery-simple-datetimepicker/ 1.1.1 - -web/static/vendor/js/jquery.min.js jquery-1.8.3 -web/static/vendor/js/handlebars.js 1.0.rc.2 -web/static/vendor/js/jquery.selection.js https://github.com/madapaja/jquery.selection/commit/90736ca5c97e603af0c0c1c823cb340860926077 -web/static/vendor/js/jquery.hotkeys.js https://github.com/jeresig/jquery.hotkeys/commit/0033d9082ce28b476ad09b26a5fd77befe1fbd42 - diff --git a/Makefile b/Makefile index bbcc0e063..3a71824f6 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright 2013 Prometheus Team +# Copyright 2013 The Prometheus 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 diff --git a/Makefile.INCLUDE b/Makefile.INCLUDE index 799c00435..898b948fb 100644 --- a/Makefile.INCLUDE +++ b/Makefile.INCLUDE @@ -1,6 +1,6 @@ # -*- Mode: makefile -*- -# Copyright 2013 Prometheus Team +# Copyright 2013 The Prometheus 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 diff --git a/NOTICE b/NOTICE new file mode 100644 index 000000000..6d8d2b8d8 --- /dev/null +++ b/NOTICE @@ -0,0 +1,68 @@ +The Prometheus systems and service monitoring server +Copyright 2012-2015 The Prometheus Authors + +This product includes software developed at +SoundCloud Ltd. (http://soundcloud.com/). + + +The following components are included in this product: + +Bootstrap +http://getbootstrap.com +Copyright 2011-2014 Twitter, Inc. +Licensed under the MIT License + +bootstrap3-typeahead.js +https://github.com/bassjobsen/Bootstrap-3-Typeahead +Original written by @mdo and @fat +Copyright 2014 Bass Jobsen @bassjobsen +Licensed under the Apache License, Version 2.0 + +bootstrap-datetimepicker.js +http://www.eyecon.ro/bootstrap-datepicker +Copyright 2012 Stefan Petre +Licensed under the Apache License, Version 2.0 + +Rickshaw +https://github.com/shutterstock/rickshaw +Copyright 2011-2014 by Shutterstock Images, LLC +See https://github.com/shutterstock/rickshaw/blob/master/LICENSE for license details + +handlebars.js +Copyright 2011 by Yehuda Katz +See web/static/vendor/js/handlebars.js for license details + +jQuery +https://jquery.org +Copyright jQuery Foundation and other contributors +Licensed under the MIT License + +Go support for Protocol Buffers - Google's data interchange format +http://code.google.com/p/goprotobuf/ +Copyright 2010 The Go Authors +See source code for license details. + +Go support for leveled logs, analogous to +https://code.google.com/p/google-glog/ +Copyright 2013 Google Inc. +Licensed under the Apache License, Version 2.0 + +Support for streaming Protocol Buffer messages for the Go language (golang). +https://github.com/matttproud/golang_protobuf_extensions +Copyright 2013 Matt T. Proud +Licensed under the Apache License, Version 2.0 + +DNS library in Go +http://miek.nl/posts/2014/Aug/16/go-dns-package/ +Copyright 2009 The Go Authors, 2011 Miek Gieben +See https://github.com/miekg/dns/blob/master/LICENSE for license details. + +LevelDB key/value database in Go +https://github.com/syndtr/goleveldb +Copyright 2012 Suryandaru Triandana +See https://github.com/syndtr/goleveldb/blob/master/LICENSE for license details. + +gosnappy - a fork of code.google.com/p/snappy-go +https://github.com/syndtr/gosnappy +Copyright 2011 The Snappy-Go Authors +See https://github.com/syndtr/gosnappy/blob/master/LICENSE for license details. diff --git a/build_info.go b/build_info.go index 254802932..dcc360b90 100644 --- a/build_info.go +++ b/build_info.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/config/Makefile b/config/Makefile index f41c46171..972d55003 100644 --- a/config/Makefile +++ b/config/Makefile @@ -1,4 +1,4 @@ -# Copyright 2013 Prometheus Team +# Copyright 2013 The Prometheus 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 diff --git a/config/config.go b/config/config.go index c3bcbacb9..afb8f05cf 100644 --- a/config/config.go +++ b/config/config.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/config/config.proto b/config/config.proto index 06660d85f..edfce2a7a 100644 --- a/config/config.proto +++ b/config/config.proto @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/config/config_test.go b/config/config_test.go index 062b2bcc4..acc94b50d 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/config/load.go b/config/load.go index 6d1a807e1..f007ab5a8 100644 --- a/config/load.go +++ b/config/load.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/config/load_test.go b/config/load_test.go index 3c03110b5..0a086f300 100644 --- a/config/load_test.go +++ b/config/load_test.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/main.go b/main.go index 8b3c33e7b..ea23a0026 100644 --- a/main.go +++ b/main.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/notification/notification.go b/notification/notification.go index d27c2feeb..7039195c0 100644 --- a/notification/notification.go +++ b/notification/notification.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/notification/notification_test.go b/notification/notification_test.go index 9de3140c3..b540312fe 100644 --- a/notification/notification_test.go +++ b/notification/notification_test.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/retrieval/helpers_test.go b/retrieval/helpers_test.go index 3777fb302..cfc7514b8 100644 --- a/retrieval/helpers_test.go +++ b/retrieval/helpers_test.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/retrieval/ingester.go b/retrieval/ingester.go index 50f66beca..55e0f51ae 100644 --- a/retrieval/ingester.go +++ b/retrieval/ingester.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/retrieval/interface_test.go b/retrieval/interface_test.go index 166675ea6..5377e8235 100644 --- a/retrieval/interface_test.go +++ b/retrieval/interface_test.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/retrieval/target.go b/retrieval/target.go index 8da1c0886..218338683 100644 --- a/retrieval/target.go +++ b/retrieval/target.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/retrieval/target_provider.go b/retrieval/target_provider.go index a5e2af7b9..0b3fbebf0 100644 --- a/retrieval/target_provider.go +++ b/retrieval/target_provider.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/retrieval/target_test.go b/retrieval/target_test.go index 0e96d205e..dee3bce31 100644 --- a/retrieval/target_test.go +++ b/retrieval/target_test.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/retrieval/targetmanager.go b/retrieval/targetmanager.go index 4289215c6..5df7dd686 100644 --- a/retrieval/targetmanager.go +++ b/retrieval/targetmanager.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/retrieval/targetmanager_test.go b/retrieval/targetmanager_test.go index d85176b34..52c28c47f 100644 --- a/retrieval/targetmanager_test.go +++ b/retrieval/targetmanager_test.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/retrieval/targetpool.go b/retrieval/targetpool.go index 63b458e43..d8aa2613e 100644 --- a/retrieval/targetpool.go +++ b/retrieval/targetpool.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/retrieval/targetpool_test.go b/retrieval/targetpool_test.go index ca6217a1b..28f5e74e8 100644 --- a/retrieval/targetpool_test.go +++ b/retrieval/targetpool_test.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/rules/Makefile b/rules/Makefile index 988b6e89e..12df33ff0 100644 --- a/rules/Makefile +++ b/rules/Makefile @@ -1,4 +1,4 @@ -# Copyright 2013 Prometheus Team +# Copyright 2013 The Prometheus 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 diff --git a/rules/alerting.go b/rules/alerting.go index a779d6959..7703db1c2 100644 --- a/rules/alerting.go +++ b/rules/alerting.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/rules/ast/ast.go b/rules/ast/ast.go index 9a62a8077..b23443cf7 100644 --- a/rules/ast/ast.go +++ b/rules/ast/ast.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/rules/ast/functions.go b/rules/ast/functions.go index 1ebcf2d1b..70833df2e 100644 --- a/rules/ast/functions.go +++ b/rules/ast/functions.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/rules/ast/functions_test.go b/rules/ast/functions_test.go index 8521417d5..ca3f44a57 100644 --- a/rules/ast/functions_test.go +++ b/rules/ast/functions_test.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/rules/ast/printer.go b/rules/ast/printer.go index 1e980b3e5..0c5f29d3d 100644 --- a/rules/ast/printer.go +++ b/rules/ast/printer.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/rules/ast/query_analyzer.go b/rules/ast/query_analyzer.go index 78a282997..37f4e3da2 100644 --- a/rules/ast/query_analyzer.go +++ b/rules/ast/query_analyzer.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/rules/ast/walk.go b/rules/ast/walk.go index a00fb334d..1975b2d39 100644 --- a/rules/ast/walk.go +++ b/rules/ast/walk.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/rules/helpers.go b/rules/helpers.go index 9058744e3..aa80a9e8e 100644 --- a/rules/helpers.go +++ b/rules/helpers.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/rules/helpers_test.go b/rules/helpers_test.go index 2abf5adf6..ab1da04e8 100644 --- a/rules/helpers_test.go +++ b/rules/helpers_test.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/rules/lexer.l b/rules/lexer.l index 482d70e5c..83577f175 100644 --- a/rules/lexer.l +++ b/rules/lexer.l @@ -1,4 +1,4 @@ -/* Copyright 2013 Prometheus Team +/* Copyright 2013 The Prometheus 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 diff --git a/rules/lexer.l.go b/rules/lexer.l.go index 2a0f9e3ca..d8a1d42f9 100644 --- a/rules/lexer.l.go +++ b/rules/lexer.l.go @@ -1,4 +1,4 @@ -/* Copyright 2013 Prometheus Team +/* Copyright 2013 The Prometheus 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 diff --git a/rules/load.go b/rules/load.go index b9271ce51..c165b7d2a 100644 --- a/rules/load.go +++ b/rules/load.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/rules/manager/manager.go b/rules/manager/manager.go index 7a70db8e0..bcd6e1fd2 100644 --- a/rules/manager/manager.go +++ b/rules/manager/manager.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/rules/parser.y b/rules/parser.y index d7627ddd0..af6e06941 100644 --- a/rules/parser.y +++ b/rules/parser.y @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/rules/recording.go b/rules/recording.go index 3f39ecdb9..e69356689 100644 --- a/rules/recording.go +++ b/rules/recording.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/rules/rules.go b/rules/rules.go index 54be96a11..61d774e99 100644 --- a/rules/rules.go +++ b/rules/rules.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/rules/rules_test.go b/rules/rules_test.go index fd45fa146..0f4bc7155 100644 --- a/rules/rules_test.go +++ b/rules/rules_test.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/stats/query_stats.go b/stats/query_stats.go index 710cab140..8ed7c5f46 100644 --- a/stats/query_stats.go +++ b/stats/query_stats.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/stats/timer.go b/stats/timer.go index 7dc7f139b..6ee915c56 100644 --- a/stats/timer.go +++ b/stats/timer.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/storage/local/chunk.go b/storage/local/chunk.go index bd871498c..bb63be2db 100644 --- a/storage/local/chunk.go +++ b/storage/local/chunk.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/storage/local/codable/codable.go b/storage/local/codable/codable.go index e8ff209aa..364f7b45e 100644 --- a/storage/local/codable/codable.go +++ b/storage/local/codable/codable.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/storage/local/codable/codable_test.go b/storage/local/codable/codable_test.go index 14ee8c15a..501399913 100644 --- a/storage/local/codable/codable_test.go +++ b/storage/local/codable/codable_test.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/storage/local/delta.go b/storage/local/delta.go index 15d8d6e3a..e44153001 100644 --- a/storage/local/delta.go +++ b/storage/local/delta.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/storage/local/index/index.go b/storage/local/index/index.go index 1c4c123d6..6ccd7ffec 100644 --- a/storage/local/index/index.go +++ b/storage/local/index/index.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/storage/local/index/interface.go b/storage/local/index/interface.go index c475b4d51..9b79ab2de 100644 --- a/storage/local/index/interface.go +++ b/storage/local/index/interface.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/storage/local/index/leveldb.go b/storage/local/index/leveldb.go index fa6f4b896..77bed8abc 100644 --- a/storage/local/index/leveldb.go +++ b/storage/local/index/leveldb.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/storage/local/instrumentation.go b/storage/local/instrumentation.go index 9d11fbfeb..48af8df80 100644 --- a/storage/local/instrumentation.go +++ b/storage/local/instrumentation.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/storage/local/interface.go b/storage/local/interface.go index 2a7fae261..6d5c1d8f5 100644 --- a/storage/local/interface.go +++ b/storage/local/interface.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/storage/local/persistence.go b/storage/local/persistence.go index 6a2d2532e..34975dc35 100644 --- a/storage/local/persistence.go +++ b/storage/local/persistence.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/storage/local/persistence_test.go b/storage/local/persistence_test.go index a395a6360..ecf941590 100644 --- a/storage/local/persistence_test.go +++ b/storage/local/persistence_test.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/storage/local/preload.go b/storage/local/preload.go index ef5f110e0..077cccca0 100644 --- a/storage/local/preload.go +++ b/storage/local/preload.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/storage/local/series.go b/storage/local/series.go index d5850f05d..8f47dc639 100644 --- a/storage/local/series.go +++ b/storage/local/series.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/storage/local/storage.go b/storage/local/storage.go index d64eadd2d..9b8c385d6 100644 --- a/storage/local/storage.go +++ b/storage/local/storage.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/storage/local/storage_test.go b/storage/local/storage_test.go index 19c5fa80e..461cd8dcd 100644 --- a/storage/local/storage_test.go +++ b/storage/local/storage_test.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/storage/local/test_helpers.go b/storage/local/test_helpers.go index 91b1156c3..c04b61adf 100644 --- a/storage/local/test_helpers.go +++ b/storage/local/test_helpers.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/storage/metric/labelpair.go b/storage/metric/labelpair.go index afecb42a4..7f991b069 100644 --- a/storage/metric/labelpair.go +++ b/storage/metric/labelpair.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/storage/metric/labelpair_test.go b/storage/metric/labelpair_test.go index df3c3e8a9..12b47235e 100644 --- a/storage/metric/labelpair_test.go +++ b/storage/metric/labelpair_test.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/storage/metric/matcher.go b/storage/metric/matcher.go index 395f2b9fe..26a8df706 100644 --- a/storage/metric/matcher.go +++ b/storage/metric/matcher.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/storage/metric/sample.go b/storage/metric/sample.go index 532f0b900..734b00ffc 100644 --- a/storage/metric/sample.go +++ b/storage/metric/sample.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/storage/remote/opentsdb/client_test.go b/storage/remote/opentsdb/client_test.go index 1f1372894..0e222a4c6 100644 --- a/storage/remote/opentsdb/client_test.go +++ b/storage/remote/opentsdb/client_test.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/storage/remote/queue_manager.go b/storage/remote/queue_manager.go index 0deff6c1c..526400911 100644 --- a/storage/remote/queue_manager.go +++ b/storage/remote/queue_manager.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/storage/remote/queue_manager_test.go b/storage/remote/queue_manager_test.go index 91d889767..83429efa8 100644 --- a/storage/remote/queue_manager_test.go +++ b/storage/remote/queue_manager_test.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/templates/templates.go b/templates/templates.go index 9b0928b31..a990de63b 100644 --- a/templates/templates.go +++ b/templates/templates.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/templates/templates_test.go b/templates/templates_test.go index cea9a6c15..262699526 100644 --- a/templates/templates_test.go +++ b/templates/templates_test.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/tools/Makefile b/tools/Makefile index 4e517ac8e..5b462cabd 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,4 +1,4 @@ -# Copyright 2013 Prometheus Team +# Copyright 2013 The Prometheus 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 diff --git a/tools/rule_checker/Makefile b/tools/rule_checker/Makefile index e787a610a..4a27092b3 100644 --- a/tools/rule_checker/Makefile +++ b/tools/rule_checker/Makefile @@ -1,4 +1,4 @@ -# Copyright 2013 Prometheus Team +# Copyright 2013 The Prometheus 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 diff --git a/tools/rule_checker/main.go b/tools/rule_checker/main.go index c7d92644c..52f891d24 100644 --- a/tools/rule_checker/main.go +++ b/tools/rule_checker/main.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/travis-helper.sh b/travis-helper.sh index 033a90ff2..dbf55ac0d 100755 --- a/travis-helper.sh +++ b/travis-helper.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2013 Prometheus Team +# Copyright 2013 The Prometheus 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 diff --git a/utility/deadline_client.go b/utility/deadline_client.go index b01ba05eb..886cf7a27 100644 --- a/utility/deadline_client.go +++ b/utility/deadline_client.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/utility/set.go b/utility/set.go index 437368fe9..ba1034e3a 100644 --- a/utility/set.go +++ b/utility/set.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/utility/set_test.go b/utility/set_test.go index 81400a333..7c2279845 100644 --- a/utility/set_test.go +++ b/utility/set_test.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/utility/strconv.go b/utility/strconv.go index b9ab2e00c..5e2dd8d75 100644 --- a/utility/strconv.go +++ b/utility/strconv.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/utility/test/directory.go b/utility/test/directory.go index 9647718bf..e8a8906ff 100644 --- a/utility/test/directory.go +++ b/utility/test/directory.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/utility/test/error.go b/utility/test/error.go index 2426a5074..56859457b 100644 --- a/utility/test/error.go +++ b/utility/test/error.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/utility/test/time.go b/utility/test/time.go index f787aaebd..54aaeb28f 100644 --- a/utility/test/time.go +++ b/utility/test/time.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/utility/time.go b/utility/time.go index 9525589d6..3fbe54fd6 100644 --- a/utility/time.go +++ b/utility/time.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/web/Makefile b/web/Makefile index c0ed224d6..8b73782c8 100644 --- a/web/Makefile +++ b/web/Makefile @@ -1,4 +1,4 @@ -# Copyright 2013 Prometheus Team +# Copyright 2013 The Prometheus 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 diff --git a/web/alerts.go b/web/alerts.go index 23940077e..77eb9d49b 100644 --- a/web/alerts.go +++ b/web/alerts.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/web/api/api.go b/web/api/api.go index fe420b594..4599edf07 100644 --- a/web/api/api.go +++ b/web/api/api.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/web/api/query.go b/web/api/query.go index 2fe1da415..f0616cbff 100644 --- a/web/api/query.go +++ b/web/api/query.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/web/api/targets.go b/web/api/targets.go index f92eef6f1..d864fe405 100644 --- a/web/api/targets.go +++ b/web/api/targets.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/web/blob/Makefile b/web/blob/Makefile index e6a2585e3..41e3159d9 100644 --- a/web/blob/Makefile +++ b/web/blob/Makefile @@ -1,4 +1,4 @@ -# Copyright 2013 Prometheus Team +# Copyright 2013 The Prometheus 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 diff --git a/web/consoles.go b/web/consoles.go index 816718f9d..6e0fd00da 100644 --- a/web/consoles.go +++ b/web/consoles.go @@ -1,4 +1,4 @@ -// Copyright 2014 Prometheus Team +// Copyright 2014 The Prometheus 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 diff --git a/web/handler.go b/web/handler.go index b94a1919d..ba46993c0 100644 --- a/web/handler.go +++ b/web/handler.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/web/httputils/compression.go b/web/httputils/compression.go index f142767cd..bbe4322c7 100644 --- a/web/httputils/compression.go +++ b/web/httputils/compression.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/web/httputils/httputils.go b/web/httputils/httputils.go index ca3918da4..d110de8ef 100644 --- a/web/httputils/httputils.go +++ b/web/httputils/httputils.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/web/status.go b/web/status.go index 4154f90b6..27f718ac5 100644 --- a/web/status.go +++ b/web/status.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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 diff --git a/web/web.go b/web/web.go index 72890e65a..18e714768 100644 --- a/web/web.go +++ b/web/web.go @@ -1,4 +1,4 @@ -// Copyright 2013 Prometheus Team +// Copyright 2013 The Prometheus 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