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.
KarolBedkowski · Jan 21, 2015 · 5859b74 · 5859b74
1 parent 39d2014
commit 5859b74
Show file tree

Hide file tree

Showing 97 changed files with 180 additions and 110 deletions.
diff --git a/AUTHORS 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 <andres@soundcloud.com>
+Bernerd Schaefer <bj.schaefer@gmail.com>
+Björn Rabenstein <beorn@soundcloud.com>
+Brian Brazil <brian.brazil@boxever.com>
+Conor Hennessy <conor@soundcloud.com>
+Johannes 'fish' Ziemke <fish@freigeist.org>
+Julius Volz <julius@soundcloud.com>
+Matt T. Proud <matt.proud@gmail.com>
+Peter Bourgon <pb@soundcloud.com>
+Sabra Melamed <yosabra@gmail.com>
+Stuart Nelson <stuart.nelson@soundcloud.com>
+Tobias Schmidt <ts@soundcloud.com>
+Tomás Senart <tsenart@gmail.com>
+Ursula Kallio <ursula@soundcloud.com>
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 FROM       golang:1.4
-MAINTAINER Prometheus Team <prometheus-developers@googlegroups.com>
+MAINTAINER The Prometheus Authors <prometheus-developers@googlegroups.com>
 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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