rackerlabs / blueflood

52%

master: 43%

LAST BUILD ON BRANCH annotations-feature

branch: annotations-feature

CHANGE BRANCH

x

Reset

• annotations-feature
• 1efd60b1a42e8300dda0260b08f873ca841baf7126638a5ad621b450d391f904
• added_sub_metrics_for_grafana_setup
• annotations
• annotations-grinder
• baseline-before-metadata
• blueflood-2.0.0
• blueflood-2.2.0
• blueflood-before-enums-2.0.2
• docker
• enums-feature
• gaurav/annotations
• gaurav/annotations1
• george/add_fetch_multi2
• george/fix_enum_query2
• george/grinder-enum-values
• george/multiplot_simple_number_bug
• george/rollup_delay
• george/test-enums
• goru97/CORS_support_for_events
• goru97/HNY2016
• goru97/Isolating-Docker-Docker-Compose
• goru97/cassandra_connection_fix
• goru97/docker
• goru97/docker-bf-memory-improv
• goru97/docker1
• goru97/enums-feature
• goru97/grafana_annotation_support
• goru97/grafana_annotations_support1
• goru97/grafana_blueflood_docker
• goru97/grafana_proxy
• goru97/travis_deploy
• goru97/travisci_automatic_releases
• goru97/ttl_change
• itzg/bf_plus_grafana_docker_compose
• izrik-release-2.0.0.2
• izrik-release-2.0.0.345
• izrik-release-2.0.0.8
• izrik-release-2.0.0.9
• izrik/maven-versioning
• izrik/maven-versioning-1
• izrik/maven-versioning-2
• izrik/maven-versioning-3
• izrik/remove-ZKBasedShardLockManager
• izrik/test-and-refactor-configttlprovider
• izrik/test-and-refactor-configuration-class
• izrik/test-services
• jay/fixBooleanCast
• master
• mrit-cass-es-docker-compose
• mvn_release
• perf-test-delayed-metrics
• rax-perf01
• rax-perf02
• rax-prod
• rax-qe01
• rax-qe02
• rax-release
• rax-release-v1.0.1956
• rax-release-v1.0.2123
• rax-release-v1.0.2768
• rax-release-v1.0.2915
• rax-release-v1.0.2981
• rax-stage
• release-2.0.0.7
• revert-480-annotations
• revert-486-revert-480-annotations
• rollup_metrics
• stackedsax/add_cass2015_presentation
• stackedsax/add_packer_files
• stackedsax/cleanup
• stackedsax/move_media_links
• stackedsax/packer
• stackedsax/remove_datastax_stub
• stackedsax/remove_dropwizard_for_now
• test-granularity
• timer-sum-double
• using-new-graphite-api-docker-iamge

Merge remote-tracking branch 'upstream1/master' into annotations-feature

* upstream1/master:
  Add TrackerMbean to dump payloads for individual tenants
  Changed num_tenants to annotations_num_tenants
  Changed test numbers Removed magic numbers from tests.py
  Removed .coverage file
  Annotations query added to The Grinder
  Introducing a new config property called annotations_num_tenants and correcting some wrong configs in the local properties file.
  Using local URLs in local properties, grinder.py  uses ingest ThreadManager
  Refactoring code so that generate payload just takes the metric_id as argument and ingest_url takes tenant_id as argument to make it cleaner
  Adding tests as suggested in code review
  Changed local properties file to point to grinder script and not tests
  Added the capability to distribute annotations across tenants
  Fixing a bug found in the last refactoring
  Changed README to explain new local properties file
  Fixing review comments
  Made changes after testing:   1. Changed the properties file to up the total threads,introduced annotations specific configs   2. Changed test numbers
  Adding grinder scripts for exercising annotations
  updated comments from notes I got from Chinmay
  squash commit of grinder changes
  Remove intermittent failure from Kafka Test
  Fix ElasticIOTest