Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pre release 1.22.0 #305

Merged
merged 87 commits into from
Aug 17, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
a1366aa
Generated scaffold for zabbix_server
Joeper214 Apr 18, 2016
737e958
Zabbix server model that with connections and encryption
Joeper214 Apr 18, 2016
d4f209a
Create zabbix default server into model when initiallizing SkyHopper
Joeper214 Apr 18, 2016
05f4466
Added zabbix controller, spec, model and views.
Joeper214 Apr 19, 2016
95f0c95
Links to zabbix servers page and link to zabbix url fqdn
Joeper214 Apr 19, 2016
737b172
Added zabbix server foriegn key migration to projects
Joeper214 Apr 20, 2016
ba79e70
Grid component for zabbix server, Zabbix server policy and JSON mappi…
Joeper214 Apr 21, 2016
7145d87
Merge remote-tracking branch 'origin/develop' into zabbi-scaffold
Joeper214 Apr 25, 2016
55e90fb
Zabbix policy file and javascript file
Joeper214 Apr 25, 2016
5546951
Edit and delete policy of zabbix servers
Joeper214 Apr 25, 2016
96e7103
Merge remote-tracking branch 'origin' into zabbix-scaffold
Joeper214 May 18, 2016
9ad53ec
Layouted form for adding a new zabbix server and editing zabbix server
Joeper214 May 19, 2016
ee10266
Fixed broken layout of zabbix server page
Joeper214 May 19, 2016
d3cb8b2
Partial IMplementation of IT18N on Zabbix Servers page
Joeper214 May 19, 2016
4eddc95
IT18N Success messange for zabbix server when updating and creating
Joeper214 May 19, 2016
01a1758
Partial Rubocop fix
Joeper214 May 19, 2016
594a0e4
fixed unexpected token trParren
Joeper214 May 19, 2016
c9b9dae
Applied fixes from SideCI
May 19, 2016
47d663f
Merge pull request #275 from skyarch-networks/sideci/20160519071631_r…
Joeper214 May 19, 2016
e543c96
try to fix spec
Joeper214 May 19, 2016
d9e9b15
Merge remote-tracking branch 'origin/develop' into zabbix-scaffold
Joeper214 May 19, 2016
9e7695e
Fix user admin sync zabbix spec
Joeper214 May 20, 2016
a03da8e
Merge branch 'zabbix-scaffold' of github.com:skyarch-networks/skyhopp…
Joeper214 May 20, 2016
2ffc209
IMplemente delete message and Translations on zabbix server
Joeper214 May 23, 2016
51fdeda
IMplementation for adding a new user with a correspoding zabbix serve…
Joeper214 May 24, 2016
44b14f9
Check zabbix server if existing and get version during creation
Joeper214 May 24, 2016
02edaac
Merge branch 'develop' into zabbix-scaffold
Joeper214 May 26, 2016
2af2855
fix rubocop indentation issue
Joeper214 May 26, 2016
5a99030
minor rubocop fix
Joeper214 May 26, 2016
ef6b9b3
fix rspec of zabbix.rb model and projects controller
Joeper214 May 27, 2016
53e0e96
Setting zabbix monitoring controller before action, get zabbix server…
Joeper214 May 31, 2016
ca75bcb
Merge remote-tracking branch 'origin/develop' into zabbix-scaffold
Joeper214 May 31, 2016
334ed4b
Fix test in monitoring contoller spec when setting zabbix server for …
Joeper214 Jun 2, 2016
610c7dc
Zabbix servers index and create methods test coverage.
Joeper214 Jun 2, 2016
5a884be
Merge remote-tracking branch 'origin/develop' into zabbix-scaffold
Joeper214 Jun 3, 2016
6af64e8
Updated vue.js version to v1.0.24 and moved zabbix server selected pa…
Joeper214 Jun 6, 2016
161f343
Merge remote-tracking branch 'origin' into zabbix-scaffold
Joeper214 Jun 10, 2016
f5a72aa
INfrasturcture detach function check zabbix and useradmin page contin…
Joeper214 Jun 13, 2016
67a7bb9
Merge branch 'develop' into zabbix-scaffold
Joeper214 Jun 16, 2016
4d52659
Merge remote-tracking branch 'origin/develop' into zabbix-scaffold
Joeper214 Jun 16, 2016
3ecc307
Merge remote-tracking branch 'origin/develop' into zabbix-scaffold
Joeper214 Jun 17, 2016
32f8207
Added register host function before create and after update action fo…
Joeper214 Jun 17, 2016
4ed3c6b
Fix RSpec for ProjectsController
root-beer Jun 23, 2016
7600a7e
refactored sync zabbix function to be able to register each user to m…
Joeper214 Jun 24, 2016
1e0c051
Merge branch 'zabbix-scaffold' of github.com:skyarch-networks/skyhopp…
Joeper214 Jun 24, 2016
4b3b1bb
Merge remote-tracking branch 'origin/develop' into zabbix-scaffold
Joeper214 Jul 22, 2016
e1fb294
Fixed Zabbix server creation test by changing test parameters and bef…
Joeper214 Jul 22, 2016
5bfe48c
change cronotab Operation worker excution to 5 mins and fixed project…
Joeper214 Jul 26, 2016
213e1a6
Fix UsersAdminControllerSpec
root-beer Jul 26, 2016
bc016dc
Merge branch 'zabbix-scaffold' of github.com:skyarch-networks/skyhopp…
root-beer Jul 26, 2016
cef80cb
delete user on zabbix during user destroy
Joeper214 Jul 26, 2016
b1f0129
Fix UsersAdminControllerSpec
root-beer Jul 26, 2016
32a7442
updated zabbix delete modal confirmation message.
Joeper214 Jul 27, 2016
2f2083b
Update Japanese locale
root-beer Jul 27, 2016
b253067
Merge pull request #292 from skyarch-networks/zabbix-scaffold
root-beer Jul 27, 2016
abfbb4b
Bundle Update on 2016-07-29
deppbot Jul 28, 2016
b0a5a80
Merge pull request #307 from skyarch-networks/bundle-update-2016-07-2…
Joeper214 Jul 29, 2016
49c4206
created a private method on zabbix user update
Joeper214 Jul 29, 2016
bed0a8a
fixed wrong JSON binding for Zabbix Server Model to user_admin typesc…
Joeper214 Aug 2, 2016
97bca6c
Database migration for UserZabbixServer gerunt table
Joeper214 Aug 2, 2016
e347065
Get allowed zabbix servers for a selected user during edit and reflec…
Joeper214 Aug 3, 2016
055186f
Enable to export chef keys
root-beer Aug 3, 2016
6e4a4ef
Implemented Edit user zabbix multi select form and typescript correns…
Joeper214 Aug 3, 2016
fc5cbba
Add instruction for using knife
root-beer Aug 3, 2016
5c3cfa7
Save to backend the selected zabbix servers during update
Joeper214 Aug 4, 2016
77367c6
Use Jumbotron on the page to download chef keys
root-beer Aug 4, 2016
4b0cbce
Rephrased the english chef instruction information
Joeper214 Aug 4, 2016
f66a318
Use Rails.logger.debug instead of puts
root-beer Aug 4, 2016
3470355
Merge pull request #309 from skyarch-networks/export-chef-keys
Joeper214 Aug 4, 2016
066f186
Merge remote-tracking branch 'origin/develop' into user-zabbix
Joeper214 Aug 5, 2016
957355a
Bundle Update on 2016-08-05
deppbot Aug 5, 2016
3b4e1cc
Temporarily set ruby_dep version to 1.3.1 because it requires ruby 2.…
Joeper214 Aug 5, 2016
99200f9
Update Gemfile.locl
Joeper214 Aug 5, 2016
cccc403
Merge pull request #312 from skyarch-networks/bundle-update-2016-08-0…
Joeper214 Aug 5, 2016
7778d53
Merge branch 'master' into develop
Joeper214 Aug 5, 2016
dec0b0e
Add verification if user exits before zabbix user add/update/delete. …
Joeper214 Aug 8, 2016
de65af3
Added zabbix server fqn validator, more code test coverage, fixed bro…
Joeper214 Aug 8, 2016
e051961
changed unless to elsif statement when checking before user deletion …
Joeper214 Aug 9, 2016
a2c7c37
Merge pull request #308 from skyarch-networks/user-zabbix
root-beer Aug 9, 2016
be24edd
Change the default value during editing of zabbix agent attributes
Joeper214 Aug 10, 2016
8b6bd35
Security Update on 2016-08-12
deppbot Aug 11, 2016
b035ce3
Fix test when assigning an fqdn default attribute when editing zabbix…
Joeper214 Aug 12, 2016
0a256de
Merge pull request #316 from skyarch-networks/security-update-2016-08…
Joeper214 Aug 12, 2016
dea6d36
Removed deprecated and unused xray-rails debugger.
Joeper214 Aug 12, 2016
933c15a
Bundle Update on 2016-08-12
deppbot Aug 12, 2016
00e1818
Merge pull request #317 from skyarch-networks/bundle-update-2016-08-1…
Joeper214 Aug 15, 2016
38eeb26
Merge pull request #315 from skyarch-networks/zabbix-agent
root-beer Aug 17, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '~> 4.2.5.2'
gem 'rails', '~> 4.2.7.1'

# Use mysql as the database for Active Record
gem 'mysql2', '~> 0.3.20'
Expand Down Expand Up @@ -59,6 +59,9 @@ gem 'foreman', require: false

gem "bootstrap-table-rails"

# Temporarily set ruby_dep version to 1.3.1 because it requires ruby 2.2.5 that is not yet available on amazon linux
gem "ruby_dep", "~> 1.3.1"

group :development, :test do
# debug
gem "tapp"
Expand All @@ -72,7 +75,6 @@ group :development, :test do
gem "awesome_print"
gem 'rack-contrib'
gem 'ruby-prof'
gem 'xray-rails'

gem 'quiet_assets'

Expand Down Expand Up @@ -102,7 +104,7 @@ group :development, :test do
end

# for Login
gem 'devise', '~> 3.5.3'
gem 'devise', '~> 3.5.3'
gem 'pundit'

# pagination
Expand All @@ -127,3 +129,5 @@ gem 'sky_zabbix', '~> 2.2.0'
gem 'nokogiri', '>= 1.6.8'

gem 'rails-html-sanitizer', '~> 1.0.3'

gem 'rubyzip'