From 52d6ec60ad8c0f25b6ec3c75a0ea4715d7e9463c Mon Sep 17 00:00:00 2001 From: yseto Date: Tue, 13 Dec 2022 20:17:52 +0900 Subject: [PATCH] apply sort on update-docs.pl --- packaging/deb-v2/debian/rules | 2 +- packaging/deb/debian/rules | 2 +- packaging/deb/debian/source/include-binaries | 20 ++++++++++---------- packaging/rpm/mackerel-agent-plugins-v2.spec | 2 +- packaging/rpm/mackerel-agent-plugins.spec | 2 +- tool/update-docs.pl | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packaging/deb-v2/debian/rules b/packaging/deb-v2/debian/rules index 25a8b82df..58e1ab376 100755 --- a/packaging/deb-v2/debian/rules +++ b/packaging/deb-v2/debian/rules @@ -10,6 +10,6 @@ override_dh_auto_install: dh_auto_install install -d -m 755 debian/${package}/usr/bin install -m 755 debian/mackerel-plugin debian/${package}/usr/bin/mackerel-plugin - for i in accesslog apache2 aws-dynamodb aws-ec2-cpucredit aws-elasticache aws-elasticsearch aws-elb aws-kinesis-streams aws-lambda aws-rds aws-ses aws-s3-requests conntrack elasticsearch flume gostats graphite haproxy jmx-jolokia jvm linux mailq memcached mongodb multicore munin mysql nginx openldap php-apc php-fpm php-opcache plack postgres proc-fd solr rabbitmq redis sidekiq snmp squid td-table-count trafficserver twemproxy uwsgi-vassal varnish xentop aws-cloudfront aws-ec2-ebs fluentd docker unicorn uptime inode h2o; do \ + for i in accesslog apache2 aws-cloudfront aws-dynamodb aws-ec2-cpucredit aws-ec2-ebs aws-elasticache aws-elasticsearch aws-elb aws-kinesis-streams aws-lambda aws-rds aws-s3-requests aws-ses conntrack docker elasticsearch fluentd flume gostats graphite h2o haproxy inode jmx-jolokia jvm linux mailq memcached mongodb multicore munin mysql nginx openldap php-apc php-fpm php-opcache plack postgres proc-fd rabbitmq redis sidekiq snmp solr squid td-table-count trafficserver twemproxy unicorn uptime uwsgi-vassal varnish xentop; do \ ln -s ./mackerel-plugin debian/${package}/usr/bin/mackerel-plugin-$$i; \ done diff --git a/packaging/deb/debian/rules b/packaging/deb/debian/rules index 91efd93c9..3ea07351b 100755 --- a/packaging/deb/debian/rules +++ b/packaging/deb/debian/rules @@ -8,7 +8,7 @@ package=mackerel-agent-plugins override_dh_auto_install: dh_auto_install install -d -m 755 debian/${package}/usr/bin - for i in accesslog apache2 aws-dynamodb aws-ec2-cpucredit aws-elasticache aws-elasticsearch aws-elb aws-kinesis-streams aws-lambda aws-rds aws-ses aws-s3-requests conntrack elasticsearch flume gostats graphite haproxy jmx-jolokia jvm linux mailq memcached mongodb multicore munin mysql nginx openldap php-apc php-fpm php-opcache plack postgres proc-fd solr rabbitmq redis sidekiq snmp squid td-table-count trafficserver twemproxy uwsgi-vassal varnish xentop aws-cloudfront aws-ec2-ebs fluentd docker unicorn uptime inode h2o; do \ + for i in accesslog apache2 aws-cloudfront aws-dynamodb aws-ec2-cpucredit aws-ec2-ebs aws-elasticache aws-elasticsearch aws-elb aws-kinesis-streams aws-lambda aws-rds aws-s3-requests aws-ses conntrack docker elasticsearch fluentd flume gostats graphite h2o haproxy inode jmx-jolokia jvm linux mailq memcached mongodb multicore munin mysql nginx openldap php-apc php-fpm php-opcache plack postgres proc-fd rabbitmq redis sidekiq snmp solr squid td-table-count trafficserver twemproxy unicorn uptime uwsgi-vassal varnish xentop; do \ install -m755 debian/mackerel-plugin-$$i debian/${package}/usr/bin; \ done install -d -m 755 debian/${package}/usr/local/bin diff --git a/packaging/deb/debian/source/include-binaries b/packaging/deb/debian/source/include-binaries index 180a1c43a..14b99440f 100644 --- a/packaging/deb/debian/source/include-binaries +++ b/packaging/deb/debian/source/include-binaries @@ -1,21 +1,27 @@ debian/mackerel-plugin-accesslog debian/mackerel-plugin-apache2 +debian/mackerel-plugin-aws-cloudfront debian/mackerel-plugin-aws-dynamodb debian/mackerel-plugin-aws-ec2-cpucredit +debian/mackerel-plugin-aws-ec2-ebs debian/mackerel-plugin-aws-elasticache debian/mackerel-plugin-aws-elasticsearch debian/mackerel-plugin-aws-elb debian/mackerel-plugin-aws-kinesis-streams debian/mackerel-plugin-aws-lambda debian/mackerel-plugin-aws-rds -debian/mackerel-plugin-aws-ses debian/mackerel-plugin-aws-s3-requests +debian/mackerel-plugin-aws-ses debian/mackerel-plugin-conntrack +debian/mackerel-plugin-docker debian/mackerel-plugin-elasticsearch +debian/mackerel-plugin-fluentd debian/mackerel-plugin-flume debian/mackerel-plugin-gostats debian/mackerel-plugin-graphite +debian/mackerel-plugin-h2o debian/mackerel-plugin-haproxy +debian/mackerel-plugin-inode debian/mackerel-plugin-jmx-jolokia debian/mackerel-plugin-jvm debian/mackerel-plugin-linux @@ -33,23 +39,17 @@ debian/mackerel-plugin-php-opcache debian/mackerel-plugin-plack debian/mackerel-plugin-postgres debian/mackerel-plugin-proc-fd -debian/mackerel-plugin-solr debian/mackerel-plugin-rabbitmq debian/mackerel-plugin-redis debian/mackerel-plugin-sidekiq debian/mackerel-plugin-snmp +debian/mackerel-plugin-solr debian/mackerel-plugin-squid debian/mackerel-plugin-td-table-count debian/mackerel-plugin-trafficserver debian/mackerel-plugin-twemproxy +debian/mackerel-plugin-unicorn +debian/mackerel-plugin-uptime debian/mackerel-plugin-uwsgi-vassal debian/mackerel-plugin-varnish debian/mackerel-plugin-xentop -debian/mackerel-plugin-aws-cloudfront -debian/mackerel-plugin-aws-ec2-ebs -debian/mackerel-plugin-fluentd -debian/mackerel-plugin-docker -debian/mackerel-plugin-unicorn -debian/mackerel-plugin-uptime -debian/mackerel-plugin-inode -debian/mackerel-plugin-h2o diff --git a/packaging/rpm/mackerel-agent-plugins-v2.spec b/packaging/rpm/mackerel-agent-plugins-v2.spec index 8e309d419..c67365feb 100644 --- a/packaging/rpm/mackerel-agent-plugins-v2.spec +++ b/packaging/rpm/mackerel-agent-plugins-v2.spec @@ -27,7 +27,7 @@ This package provides metric plugins for Mackerel. %{__install} -m0755 %{_sourcedir}/build/mackerel-plugin %{buildroot}%{__targetdir}/ -for i in accesslog apache2 aws-dynamodb aws-ec2-cpucredit aws-elasticache aws-elasticsearch aws-elb aws-kinesis-streams aws-lambda aws-rds aws-ses aws-s3-requests conntrack elasticsearch flume gostats graphite haproxy jmx-jolokia jvm linux mailq memcached mongodb multicore munin mysql nginx openldap php-apc php-fpm php-opcache plack postgres proc-fd solr rabbitmq redis sidekiq snmp squid td-table-count trafficserver twemproxy uwsgi-vassal varnish xentop aws-cloudfront aws-ec2-ebs fluentd docker unicorn uptime inode h2o; do \ +for i in accesslog apache2 aws-cloudfront aws-dynamodb aws-ec2-cpucredit aws-ec2-ebs aws-elasticache aws-elasticsearch aws-elb aws-kinesis-streams aws-lambda aws-rds aws-s3-requests aws-ses conntrack docker elasticsearch fluentd flume gostats graphite h2o haproxy inode jmx-jolokia jvm linux mailq memcached mongodb multicore munin mysql nginx openldap php-apc php-fpm php-opcache plack postgres proc-fd rabbitmq redis sidekiq snmp solr squid td-table-count trafficserver twemproxy unicorn uptime uwsgi-vassal varnish xentop; do \ ln -s ./mackerel-plugin %{buildroot}%{__targetdir}/mackerel-plugin-$i; \ done diff --git a/packaging/rpm/mackerel-agent-plugins.spec b/packaging/rpm/mackerel-agent-plugins.spec index b7ecd0132..9e1761963 100644 --- a/packaging/rpm/mackerel-agent-plugins.spec +++ b/packaging/rpm/mackerel-agent-plugins.spec @@ -29,7 +29,7 @@ This package provides plugins for Mackerel. %{__mkdir} -p %{buildroot}%{__targetdir} -for i in accesslog apache2 aws-dynamodb aws-ec2-cpucredit aws-elasticache aws-elasticsearch aws-elb aws-kinesis-streams aws-lambda aws-rds aws-ses aws-s3-requests conntrack elasticsearch flume gostats graphite haproxy jmx-jolokia jvm linux mailq memcached mongodb multicore munin mysql nginx openldap php-apc php-fpm php-opcache plack postgres proc-fd solr rabbitmq redis sidekiq snmp squid td-table-count trafficserver twemproxy uwsgi-vassal varnish xentop aws-cloudfront aws-ec2-ebs fluentd docker unicorn uptime inode h2o; do \ +for i in accesslog apache2 aws-cloudfront aws-dynamodb aws-ec2-cpucredit aws-ec2-ebs aws-elasticache aws-elasticsearch aws-elb aws-kinesis-streams aws-lambda aws-rds aws-s3-requests aws-ses conntrack docker elasticsearch fluentd flume gostats graphite h2o haproxy inode jmx-jolokia jvm linux mailq memcached mongodb multicore munin mysql nginx openldap php-apc php-fpm php-opcache plack postgres proc-fd rabbitmq redis sidekiq snmp solr squid td-table-count trafficserver twemproxy unicorn uptime uwsgi-vassal varnish xentop; do \ %{__install} -m0755 %{_sourcedir}/%{_bindir}/mackerel-plugin-$i %{buildroot}%{__targetdir}/; \ done diff --git a/tool/update-docs.pl b/tool/update-docs.pl index 44ff25da5..1504c67b4 100644 --- a/tool/update-docs.pl +++ b/tool/update-docs.pl @@ -67,7 +67,7 @@ sub main { my @plugins = retrieve_plugins; update_readme(@plugins); my $config = load_packaging_confg; - update_packaging_specs(@{ $config->{plugins} }); + update_packaging_specs(sort @{ $config->{plugins} }); } main();