fluentd-ui 1.0.1 → 1.1.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of fluentd-ui might be problematic. Click here for more details.

Files changed (67) hide show
  1. checksums.yaml +4 -4
  2. data/ChangeLog.md +5 -0
  3. data/Gemfile.lock +1 -1
  4. data/app/controllers/api/settings_controller.rb +46 -16
  5. data/app/controllers/concerns/setting_concern.rb +1 -1
  6. data/app/controllers/fluentd/settings/filter_grep_controller.rb +9 -0
  7. data/app/controllers/fluentd/settings/filter_parser_controller.rb +9 -0
  8. data/app/controllers/fluentd/settings/filter_record_transformer_controller.rb +14 -0
  9. data/app/controllers/fluentd/settings/filter_stdout_controller.rb +9 -0
  10. data/app/javascript/packs/filter_grep_setting.js +39 -0
  11. data/app/javascript/packs/grep_container.js +53 -0
  12. data/app/javascript/packs/grep_pattern.js +43 -0
  13. data/app/javascript/packs/owned_plugin_form.js +9 -7
  14. data/app/javascript/packs/settings.js +34 -16
  15. data/app/models/concerns/fluentd/setting/configurable.rb +1 -0
  16. data/app/models/concerns/fluentd/setting/label.rb +11 -0
  17. data/app/models/concerns/fluentd/setting/plugin.rb +2 -0
  18. data/app/models/concerns/fluentd/setting/plugin_config.rb +34 -4
  19. data/app/models/concerns/fluentd/setting/section_config.rb +10 -2
  20. data/app/models/fluentd/agent/common.rb +97 -0
  21. data/app/models/fluentd/setting/config.rb +71 -0
  22. data/app/models/fluentd/setting/filter_grep.rb +38 -0
  23. data/app/models/fluentd/setting/filter_parser.rb +34 -0
  24. data/app/models/fluentd/setting/filter_record_transformer.rb +27 -0
  25. data/app/models/fluentd/setting/filter_stdout.rb +34 -0
  26. data/app/models/fluentd/setting/in_forward.rb +1 -0
  27. data/app/models/fluentd/setting/in_http.rb +1 -1
  28. data/app/models/fluentd/setting/in_monitor_agent.rb +1 -1
  29. data/app/models/fluentd/setting/in_syslog.rb +1 -1
  30. data/app/models/fluentd/setting/out_elasticsearch.rb +1 -0
  31. data/app/models/fluentd/setting/out_forward.rb +1 -1
  32. data/app/models/fluentd/setting/out_mongo.rb +1 -0
  33. data/app/models/fluentd/setting/out_s3.rb +1 -0
  34. data/app/models/fluentd/setting/out_stdout.rb +1 -1
  35. data/app/models/fluentd/setting/out_tdlog.rb +1 -1
  36. data/app/views/api/settings/_element.json.jbuilder +3 -1
  37. data/app/views/api/settings/index.json.jbuilder +10 -2
  38. data/app/views/api/settings/show.json.jbuilder +1 -1
  39. data/app/views/fluentd/settings/filter_grep/_form.html.haml +18 -0
  40. data/app/views/fluentd/settings/filter_record_transformer/_form.html.haml +20 -0
  41. data/app/views/fluentd/settings/in_tail/_form.html.haml +1 -0
  42. data/app/views/fluentd/settings/source_and_output.html.haml +46 -14
  43. data/app/views/shared/vue/_filter_grep_setting.html.haml +19 -0
  44. data/app/views/shared/vue/_grep_container.html.haml +32 -0
  45. data/app/views/shared/vue/_grep_pattern.html.haml +24 -0
  46. data/app/views/shared/vue/_setting.html.erb +2 -2
  47. data/config/locales/translation_en.yml +39 -10
  48. data/config/locales/translation_ja.yml +39 -10
  49. data/config/routes.rb +6 -0
  50. data/lib/fluentd-ui/version.rb +1 -1
  51. data/test/factories/fluentd.rb +4 -4
  52. data/test/factories/plugins.rb +2 -2
  53. data/test/factories/user.rb +2 -2
  54. data/test/fixtures/config/label.conf +15 -0
  55. data/test/fixtures/config/multi-label.conf +40 -0
  56. data/test/fixtures/config/simple.conf +12 -0
  57. data/test/models/fluentd/agent_common_test.rb +288 -0
  58. data/test/models/fluentd/setting/config_test.rb +98 -0
  59. data/test/support/configurable_daemon_settings.rb +1 -1
  60. data/test/system/fluentd/setting/filter_grep_test.rb +96 -0
  61. data/test/system/fluentd/setting/filter_parser_test.rb +13 -0
  62. data/test/system/fluentd/setting/filter_record_transformer_test.rb +30 -0
  63. data/test/system/fluentd/setting/filter_stdout_test.rb +13 -0
  64. data/test/system/source_and_output_test.rb +168 -19
  65. data/test/test_helper.rb +4 -0
  66. metadata +98 -55
  67. data/.rspec +0 -2
data/test/test_helper.rb CHANGED
@@ -18,6 +18,10 @@ module FixturePath
18
18
  def fixture_path(fixture_name)
19
19
  Rails.root.join("test/fixtures", fixture_name).to_s
20
20
  end
21
+
22
+ def fixture_content(fixture_name)
23
+ Rails.root.join("test/fixtures", fixture_name).read
24
+ end
21
25
  end
22
26
 
23
27
  class ActiveSupport::TestCase
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluentd-ui
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2018-09-14 00:00:00.000000000 Z
12
+ date: 2018-09-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: fluentd
@@ -381,7 +381,6 @@ files:
381
381
  - ".eslintrc.js"
382
382
  - ".gitignore"
383
383
  - ".postcssrc.yml"
384
- - ".rspec"
385
384
  - ".travis.yml"
386
385
  - ChangeLog
387
386
  - ChangeLog.md
@@ -403,6 +402,10 @@ files:
403
402
  - app/controllers/concerns/setting_concern.rb
404
403
  - app/controllers/concerns/setting_history_concern.rb
405
404
  - app/controllers/fluentd/agents_controller.rb
405
+ - app/controllers/fluentd/settings/filter_grep_controller.rb
406
+ - app/controllers/fluentd/settings/filter_parser_controller.rb
407
+ - app/controllers/fluentd/settings/filter_record_transformer_controller.rb
408
+ - app/controllers/fluentd/settings/filter_stdout_controller.rb
406
409
  - app/controllers/fluentd/settings/histories_controller.rb
407
410
  - app/controllers/fluentd/settings/in_forward_controller.rb
408
411
  - app/controllers/fluentd/settings/in_http_controller.rb
@@ -433,7 +436,10 @@ files:
433
436
  - app/javascript/packs/aws_credential.js
434
437
  - app/javascript/packs/codemirror.js
435
438
  - app/javascript/packs/config_field.js
439
+ - app/javascript/packs/filter_grep_setting.js
436
440
  - app/javascript/packs/fluent_log.js
441
+ - app/javascript/packs/grep_container.js
442
+ - app/javascript/packs/grep_pattern.js
437
443
  - app/javascript/packs/in_tail_parse.js
438
444
  - app/javascript/packs/nested_settings.js
439
445
  - app/javascript/packs/notification.js
@@ -458,6 +464,7 @@ files:
458
464
  - app/models/.keep
459
465
  - app/models/concerns/.keep
460
466
  - app/models/concerns/fluentd/setting/configurable.rb
467
+ - app/models/concerns/fluentd/setting/label.rb
461
468
  - app/models/concerns/fluentd/setting/pattern.rb
462
469
  - app/models/concerns/fluentd/setting/plugin.rb
463
470
  - app/models/concerns/fluentd/setting/plugin_config.rb
@@ -480,6 +487,10 @@ files:
480
487
  - app/models/fluentd/setting/buffer_file.rb
481
488
  - app/models/fluentd/setting/buffer_memory.rb
482
489
  - app/models/fluentd/setting/config.rb
490
+ - app/models/fluentd/setting/filter_grep.rb
491
+ - app/models/fluentd/setting/filter_parser.rb
492
+ - app/models/fluentd/setting/filter_record_transformer.rb
493
+ - app/models/fluentd/setting/filter_stdout.rb
483
494
  - app/models/fluentd/setting/formatter_csv.rb
484
495
  - app/models/fluentd/setting/formatter_hash.rb
485
496
  - app/models/fluentd/setting/formatter_json.rb
@@ -540,6 +551,8 @@ files:
540
551
  - app/views/fluentd/log.html.haml
541
552
  - app/views/fluentd/new.html.haml
542
553
  - app/views/fluentd/settings/edit.html.haml
554
+ - app/views/fluentd/settings/filter_grep/_form.html.haml
555
+ - app/views/fluentd/settings/filter_record_transformer/_form.html.haml
543
556
  - app/views/fluentd/settings/histories/_list.html.haml
544
557
  - app/views/fluentd/settings/histories/index.html.haml
545
558
  - app/views/fluentd/settings/histories/show.html.haml
@@ -575,7 +588,10 @@ files:
575
588
  - app/views/shared/settings/show.html.haml
576
589
  - app/views/shared/vue/_aws_credential.html.haml
577
590
  - app/views/shared/vue/_config_field.html.haml
591
+ - app/views/shared/vue/_filter_grep_setting.html.haml
578
592
  - app/views/shared/vue/_fluent_log.html.erb
593
+ - app/views/shared/vue/_grep_container.html.haml
594
+ - app/views/shared/vue/_grep_pattern.html.haml
579
595
  - app/views/shared/vue/_in_tail_parse.html.haml
580
596
  - app/views/shared/vue/_notification.html.erb
581
597
  - app/views/shared/vue/_out_forward_setting.html.haml
@@ -675,7 +691,7 @@ files:
675
691
  - public/404.html
676
692
  - public/422.html
677
693
  - public/500.html
678
- - public/assets/.sprockets-manifest-dc6484ae589afa885890c520f50eb51b.json
694
+ - public/assets/.sprockets-manifest-886bbf392df214c6aedde2cafdb5e68d.json
679
695
  - public/assets/application-50d6f20589e877580d000fb7c0c720e1316973e08923a16e8f374a6be1ef571f.css
680
696
  - public/assets/application-50d6f20589e877580d000fb7c0c720e1316973e08923a16e8f374a6be1ef571f.css.gz
681
697
  - public/assets/fontawesome-webfont-2adefcbc041e7d18fcf2d417879dc5a09997aa64d675b7a3c4b6ce33da13f3fe.woff2
@@ -692,59 +708,68 @@ files:
692
708
  - public/fluentd.png
693
709
  - public/packs/application-d41d8cd98f00b204e9800998ecf8427e.css
694
710
  - public/packs/application-d41d8cd98f00b204e9800998ecf8427e.css.map
695
- - public/packs/application-d9c1a8fd897e89f4339b.js
696
- - public/packs/application-d9c1a8fd897e89f4339b.js.gz
697
- - public/packs/application-d9c1a8fd897e89f4339b.js.map
698
- - public/packs/aws_credential-f430abe47eff7a069b97.js
699
- - public/packs/aws_credential-f430abe47eff7a069b97.js.gz
700
- - public/packs/aws_credential-f430abe47eff7a069b97.js.map
701
- - public/packs/codemirror-1a4a1c6e408410a4615f.js
702
- - public/packs/codemirror-1a4a1c6e408410a4615f.js.gz
703
- - public/packs/codemirror-1a4a1c6e408410a4615f.js.map
704
- - public/packs/config_field-f5bced5c699aea7c0ab8.js
705
- - public/packs/config_field-f5bced5c699aea7c0ab8.js.gz
706
- - public/packs/config_field-f5bced5c699aea7c0ab8.js.map
707
- - public/packs/fluent_log-1a50e9efd568574f6edb.js
708
- - public/packs/fluent_log-1a50e9efd568574f6edb.js.gz
709
- - public/packs/fluent_log-1a50e9efd568574f6edb.js.map
710
- - public/packs/in_tail_parse-2de6badcc5ad71a660ff.js
711
- - public/packs/in_tail_parse-2de6badcc5ad71a660ff.js.gz
712
- - public/packs/in_tail_parse-2de6badcc5ad71a660ff.js.map
711
+ - public/packs/application-eea48377e75e91c6fba1.js
712
+ - public/packs/application-eea48377e75e91c6fba1.js.gz
713
+ - public/packs/application-eea48377e75e91c6fba1.js.map
714
+ - public/packs/aws_credential-195964ad3cdfdfe0657e.js
715
+ - public/packs/aws_credential-195964ad3cdfdfe0657e.js.gz
716
+ - public/packs/aws_credential-195964ad3cdfdfe0657e.js.map
717
+ - public/packs/codemirror-80262b05737d805a40a6.js
718
+ - public/packs/codemirror-80262b05737d805a40a6.js.gz
719
+ - public/packs/codemirror-80262b05737d805a40a6.js.map
720
+ - public/packs/config_field-bab812198ad9c91d6ce1.js
721
+ - public/packs/config_field-bab812198ad9c91d6ce1.js.gz
722
+ - public/packs/config_field-bab812198ad9c91d6ce1.js.map
723
+ - public/packs/filter_grep_setting-68ea1a819739c83b4999.js
724
+ - public/packs/filter_grep_setting-68ea1a819739c83b4999.js.gz
725
+ - public/packs/filter_grep_setting-68ea1a819739c83b4999.js.map
726
+ - public/packs/fluent_log-755084e743096ea8b024.js
727
+ - public/packs/fluent_log-755084e743096ea8b024.js.gz
728
+ - public/packs/fluent_log-755084e743096ea8b024.js.map
729
+ - public/packs/grep_container-37791f0d467870185c54.js
730
+ - public/packs/grep_container-37791f0d467870185c54.js.gz
731
+ - public/packs/grep_container-37791f0d467870185c54.js.map
732
+ - public/packs/grep_pattern-2dd582b3b30589c84945.js
733
+ - public/packs/grep_pattern-2dd582b3b30589c84945.js.gz
734
+ - public/packs/grep_pattern-2dd582b3b30589c84945.js.map
735
+ - public/packs/in_tail_parse-833d7abdadeb0c482213.js
736
+ - public/packs/in_tail_parse-833d7abdadeb0c482213.js.gz
737
+ - public/packs/in_tail_parse-833d7abdadeb0c482213.js.map
713
738
  - public/packs/manifest.json
714
739
  - public/packs/manifest.json.gz
715
- - public/packs/nested_settings-2313b8ea59398970c904.js
716
- - public/packs/nested_settings-2313b8ea59398970c904.js.gz
717
- - public/packs/nested_settings-2313b8ea59398970c904.js.map
718
- - public/packs/notification-f768826be3e0288d203f.js
719
- - public/packs/notification-f768826be3e0288d203f.js.gz
720
- - public/packs/notification-f768826be3e0288d203f.js.map
721
- - public/packs/out_forward_setting-ce4c7ee9e840771e7b92.js
722
- - public/packs/out_forward_setting-ce4c7ee9e840771e7b92.js.gz
723
- - public/packs/out_forward_setting-ce4c7ee9e840771e7b92.js.map
724
- - public/packs/out_s3_setting-85b0127b3014a94572a4.js
725
- - public/packs/out_s3_setting-85b0127b3014a94572a4.js.gz
726
- - public/packs/out_s3_setting-85b0127b3014a94572a4.js.map
727
- - public/packs/owned_plugin_form-bea7a26ed698d078f6b3.js
728
- - public/packs/owned_plugin_form-bea7a26ed698d078f6b3.js.gz
729
- - public/packs/owned_plugin_form-bea7a26ed698d078f6b3.js.map
730
- - public/packs/parser_multiline_form-cca4bfb7c59eb3f2ede8.js
731
- - public/packs/parser_multiline_form-cca4bfb7c59eb3f2ede8.js.gz
732
- - public/packs/parser_multiline_form-cca4bfb7c59eb3f2ede8.js.map
733
- - public/packs/plugin_setting-d563e7fbddcd0da1e35e.js
734
- - public/packs/plugin_setting-d563e7fbddcd0da1e35e.js.gz
735
- - public/packs/plugin_setting-d563e7fbddcd0da1e35e.js.map
736
- - public/packs/settings-f9107f3bfc68b1b265ce.js
737
- - public/packs/settings-f9107f3bfc68b1b265ce.js.gz
738
- - public/packs/settings-f9107f3bfc68b1b265ce.js.map
739
- - public/packs/transport_config-7dbe5e320e90edd6b4bd.js
740
- - public/packs/transport_config-7dbe5e320e90edd6b4bd.js.gz
741
- - public/packs/transport_config-7dbe5e320e90edd6b4bd.js.map
742
- - public/packs/transport_section-9685495922d19daeb522.js
743
- - public/packs/transport_section-9685495922d19daeb522.js.gz
744
- - public/packs/transport_section-9685495922d19daeb522.js.map
745
- - public/packs/treeview-d456ff8f7149706457d3.js
746
- - public/packs/treeview-d456ff8f7149706457d3.js.gz
747
- - public/packs/treeview-d456ff8f7149706457d3.js.map
740
+ - public/packs/nested_settings-70571b81882abd702be9.js
741
+ - public/packs/nested_settings-70571b81882abd702be9.js.gz
742
+ - public/packs/nested_settings-70571b81882abd702be9.js.map
743
+ - public/packs/notification-a03d0cfd91243de0bdbe.js
744
+ - public/packs/notification-a03d0cfd91243de0bdbe.js.gz
745
+ - public/packs/notification-a03d0cfd91243de0bdbe.js.map
746
+ - public/packs/out_forward_setting-978a2d72cb5d837db3d8.js
747
+ - public/packs/out_forward_setting-978a2d72cb5d837db3d8.js.gz
748
+ - public/packs/out_forward_setting-978a2d72cb5d837db3d8.js.map
749
+ - public/packs/out_s3_setting-2329d35eede3bec8f542.js
750
+ - public/packs/out_s3_setting-2329d35eede3bec8f542.js.gz
751
+ - public/packs/out_s3_setting-2329d35eede3bec8f542.js.map
752
+ - public/packs/owned_plugin_form-fb6c2758ad622f341c23.js
753
+ - public/packs/owned_plugin_form-fb6c2758ad622f341c23.js.gz
754
+ - public/packs/owned_plugin_form-fb6c2758ad622f341c23.js.map
755
+ - public/packs/parser_multiline_form-0039444fbaaa34db63ee.js
756
+ - public/packs/parser_multiline_form-0039444fbaaa34db63ee.js.gz
757
+ - public/packs/parser_multiline_form-0039444fbaaa34db63ee.js.map
758
+ - public/packs/plugin_setting-8ff45a40350dc00bc334.js
759
+ - public/packs/plugin_setting-8ff45a40350dc00bc334.js.gz
760
+ - public/packs/plugin_setting-8ff45a40350dc00bc334.js.map
761
+ - public/packs/settings-227a9f604468905bbac6.js
762
+ - public/packs/settings-227a9f604468905bbac6.js.gz
763
+ - public/packs/settings-227a9f604468905bbac6.js.map
764
+ - public/packs/transport_config-23aca119137bd72ad10f.js
765
+ - public/packs/transport_config-23aca119137bd72ad10f.js.gz
766
+ - public/packs/transport_config-23aca119137bd72ad10f.js.map
767
+ - public/packs/transport_section-cd9ff305b3c42dedcc2e.js
768
+ - public/packs/transport_section-cd9ff305b3c42dedcc2e.js.gz
769
+ - public/packs/transport_section-cd9ff305b3c42dedcc2e.js.map
770
+ - public/packs/treeview-40b20727e98da2d5cf8d.js
771
+ - public/packs/treeview-40b20727e98da2d5cf8d.js.gz
772
+ - public/packs/treeview-40b20727e98da2d5cf8d.js.map
748
773
  - public/robots.txt
749
774
  - public/td-logo.png
750
775
  - test/application_system_test_case.rb
@@ -756,6 +781,9 @@ files:
756
781
  - test/factories/fluentd.rb
757
782
  - test/factories/plugins.rb
758
783
  - test/factories/user.rb
784
+ - test/fixtures/config/label.conf
785
+ - test/fixtures/config/multi-label.conf
786
+ - test/fixtures/config/simple.conf
759
787
  - test/fixtures/error0.log
760
788
  - test/fixtures/error2.log
761
789
  - test/fixtures/error3.log
@@ -774,7 +802,9 @@ files:
774
802
  - test/lib/regexp_preview/multi_line_test.rb
775
803
  - test/lib/regexp_preview/single_line_test.rb
776
804
  - test/models/fluent_gem_test.rb
805
+ - test/models/fluentd/agent_common_test.rb
777
806
  - test/models/fluentd/agent_test.rb
807
+ - test/models/fluentd/setting/config_test.rb
778
808
  - test/models/fluentd/setting/in_forward_test.rb
779
809
  - test/models/fluentd/setting/in_http_test.rb
780
810
  - test/models/fluentd/setting/in_monitor_agent_test.rb
@@ -794,6 +824,10 @@ files:
794
824
  - test/support/login_macro.rb
795
825
  - test/support/login_required.rb
796
826
  - test/support/stub_daemon.rb
827
+ - test/system/fluentd/setting/filter_grep_test.rb
828
+ - test/system/fluentd/setting/filter_parser_test.rb
829
+ - test/system/fluentd/setting/filter_record_transformer_test.rb
830
+ - test/system/fluentd/setting/filter_stdout_test.rb
797
831
  - test/system/fluentd/setting/in_forward_test.rb
798
832
  - test/system/fluentd/setting/in_http_test.rb
799
833
  - test/system/fluentd/setting/in_monitor_agent.rb
@@ -839,6 +873,9 @@ test_files:
839
873
  - test/factories/fluentd.rb
840
874
  - test/factories/plugins.rb
841
875
  - test/factories/user.rb
876
+ - test/fixtures/config/label.conf
877
+ - test/fixtures/config/multi-label.conf
878
+ - test/fixtures/config/simple.conf
842
879
  - test/fixtures/error0.log
843
880
  - test/fixtures/error2.log
844
881
  - test/fixtures/error3.log
@@ -857,7 +894,9 @@ test_files:
857
894
  - test/lib/regexp_preview/multi_line_test.rb
858
895
  - test/lib/regexp_preview/single_line_test.rb
859
896
  - test/models/fluent_gem_test.rb
897
+ - test/models/fluentd/agent_common_test.rb
860
898
  - test/models/fluentd/agent_test.rb
899
+ - test/models/fluentd/setting/config_test.rb
861
900
  - test/models/fluentd/setting/in_forward_test.rb
862
901
  - test/models/fluentd/setting/in_http_test.rb
863
902
  - test/models/fluentd/setting/in_monitor_agent_test.rb
@@ -877,6 +916,10 @@ test_files:
877
916
  - test/support/login_macro.rb
878
917
  - test/support/login_required.rb
879
918
  - test/support/stub_daemon.rb
919
+ - test/system/fluentd/setting/filter_grep_test.rb
920
+ - test/system/fluentd/setting/filter_parser_test.rb
921
+ - test/system/fluentd/setting/filter_record_transformer_test.rb
922
+ - test/system/fluentd/setting/filter_stdout_test.rb
880
923
  - test/system/fluentd/setting/in_forward_test.rb
881
924
  - test/system/fluentd/setting/in_http_test.rb
882
925
  - test/system/fluentd/setting/in_monitor_agent.rb
data/.rspec DELETED
@@ -1,2 +0,0 @@
1
- --color
2
- -f d